From 0892413636db5a218ff4a07e5297d852e2c5b768 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 8 Dec 2016 13:33:03 -0700 Subject: [PATCH] ceph-installer-rpm: abstract build script Don't hardcode the "ceph-installer" package name in the ceph-installer-rpm build script. Determine the package name from the Jenkins job name instead. The purpose of this change is to make the build script more re-usable between different packages. (Eventually we could use JJB templates to construct multiple jobs using these same build steps.) --- ceph-installer-rpm/build/build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ceph-installer-rpm/build/build b/ceph-installer-rpm/build/build index 06b4afdb..4541d4d4 100644 --- a/ceph-installer-rpm/build/build +++ b/ceph-installer-rpm/build/build @@ -4,6 +4,10 @@ set -ex # Sanity-check: [ -z "$GIT_BRANCH" ] && echo Missing GIT_BRANCH variable && exit 1 +[ -z "$JOB_NAME" ] && echo Missing JOB_NAME variable && exit 1 + +# Strip "-rpm" off the job name to get our package's name +PACKAGE=${JOB_NAME%-rpm} sudo yum -y install epel-release sudo yum -y install fedpkg @@ -27,7 +31,7 @@ make_chacractl_config $chacra_url BRANCH=`branch_slash_filter $GIT_BRANCH` ## Upload the created RPMs to chacra -chacra_endpoint="ceph-installer/${BRANCH}/${GIT_COMMIT}/centos/7" +chacra_endpoint="${PACKAGE}/${BRANCH}/${GIT_COMMIT}/centos/7" [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" -- 2.39.5