From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 26 Jul 2017 17:37:54 +0000 (-0400)
Subject: ceph-iscsi-ansible: fix mock chroot name
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36a0f1616fe3ea603a30a97a90dd5a8aab8da7d6;p=ceph-build.git

ceph-iscsi-ansible: fix mock chroot name

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-iscsi-config/build/build_rpm b/ceph-iscsi-config/build/build_rpm
index 0040262d..7a22990c 100644
--- a/ceph-iscsi-config/build/build_rpm
+++ b/ceph-iscsi-config/build/build_rpm
@@ -39,15 +39,10 @@ rpmbuild \
     --nodeps -bs $WORKSPACE/${PROJECT}.spec
 SRPM=$(readlink -f $WORKSPACE/dist/SRPMS/*.src.rpm)
 
-# mock config
-sudo head -n -1 /etc/mock/${MOCK_TARGET}-${RELEASE}-${ARCH}.cfg > ${PROJECT}.cfg
-# for debugging
-cat ${PROJECT}.cfg
-
 ## Build the binaries with mock
 echo "Building RPMs"
-sudo mock --verbose -r ${PROJECT}.cfg --scrub=all
-sudo mock --verbose -r ${PROJECT}.cfg --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
+sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all
+sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
 
 ## Upload the created RPMs to chacra
 chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"