From 5c29959eeb081207e45d9933edec68ddf8582f19 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 26 Jul 2017 15:08:27 -0400 Subject: [PATCH] ceph-iscsi: fixed chacra rpm path Signed-off-by: Jason Dillaman --- ceph-iscsi-cli/build/build_rpm | 4 ++-- ceph-iscsi-config/build/build_rpm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ceph-iscsi-cli/build/build_rpm b/ceph-iscsi-cli/build/build_rpm index daa1fbaa..9a048720 100644 --- a/ceph-iscsi-cli/build/build_rpm +++ b/ceph-iscsi-cli/build/build_rpm @@ -57,8 +57,8 @@ chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" # push binaries to chacra -find *.rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/$ARCH/ -PACKAGE_MANAGER_VERSION=$(rpm --queryformat '%{VERSION}-%{RELEASE}\n' -qp $(find *.rpm | egrep "\.$ARCH\.rpm" | head -1)) +find $WORKSPACE/dist/RPMS/ | egrep "\.noarch\.rpm" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/noarch/ +PACKAGE_MANAGER_VERSION=$(rpm --queryformat '%{VERSION}-%{RELEASE}\n' -qp $(find $WORKSPACE/dist/RPMS/ | egrep "\.noarch\.rpm" | head -1)) # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF diff --git a/ceph-iscsi-config/build/build_rpm b/ceph-iscsi-config/build/build_rpm index ab6f12a5..6c2abbef 100644 --- a/ceph-iscsi-config/build/build_rpm +++ b/ceph-iscsi-config/build/build_rpm @@ -57,8 +57,8 @@ chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" # push binaries to chacra -find *.rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/$ARCH/ -PACKAGE_MANAGER_VERSION=$(rpm --queryformat '%{VERSION}-%{RELEASE}\n' -qp $(find *.rpm | egrep "\.$ARCH\.rpm" | head -1)) +find $WORKSPACE/dist/RPMS/ | egrep "\.noarch\.rpm" | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/noarch/ +PACKAGE_MANAGER_VERSION=$(rpm --queryformat '%{VERSION}-%{RELEASE}\n' -qp $(find $WORKSPACE/dist/RPMS/ | egrep "\.noarch\.rpm" | head -1)) # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF -- 2.47.3