]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-iscsi-stable: Check for specific package files 1374/head
authorDavid Galloway <dgallowa@redhat.com>
Thu, 22 Aug 2019 21:22:24 +0000 (17:22 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Thu, 22 Aug 2019 23:39:32 +0000 (19:39 -0400)
The -f `-*` got expanded too many times if there are multiple matches which broke the `if` statement.

Signed-off-by: David Galloway <dgallowa@redhat.com>
ceph-iscsi-stable/build/build_rpm

index 6e2a46c3cc0147b0775a69f44d721b698afc73c3..2ec241d7fb97f1deca9a5c015dea28be0a6ddde6 100644 (file)
@@ -65,13 +65,13 @@ chacra_endpoint="ceph-iscsi/${REPO_MAJOR_VERSION}/${GIT_COMMIT}/${DISTRO}/${RELE
 chacra_repo_endpoint="${chacra_endpoint}/flavors/default"
 
 # check to make sure ceph-iscsi-config package built
-if [ ! -f $WORKSPACE/dist/RPMS/ceph-iscsi-*.rpm ]; then
+if [ ! -f $WORKSPACE/dist/RPMS/ceph-iscsi-${CEPH_ISCSI_BRANCH}-1.el${RELEASE}.noarch.rpm ]; then
     echo "ceph-iscsi rpm not built!"
     exit 1
 fi
 
 # check to make sure ceph-iscsi-tools package built
-if [ ! -f $WORKSPACE/dist/RPMS/ceph-iscsi-tools-*.rpm ]; then
+if [ ! -f $WORKSPACE/dist/RPMS/ceph-iscsi-tools-${CEPH_ISCSI_TOOLS_BRANCH}-1.el${RELEASE}.noarch.rpm ]; then
     echo "ceph-iscsi-tools rpm not built!"
     exit 1
 fi