From 8b6b0665867e72c74b3f1cf34f0976860d8da01e Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 27 Feb 2017 12:21:50 -0500 Subject: [PATCH] tcmu-runner / rtslib-fb: sanitize branch name Signed-off-by: Jason Dillaman --- rtslib-fb/build/build_rpm | 3 ++- tcmu-runner/build/build_rpm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rtslib-fb/build/build_rpm b/rtslib-fb/build/build_rpm index 966a499b..6616490c 100644 --- a/rtslib-fb/build/build_rpm +++ b/rtslib-fb/build/build_rpm @@ -1,12 +1,13 @@ #! /usr/bin/bash set -ex +BRANCH=`branch_slash_filter $BRANCH` + # Only do actual work when we are an RPM distro if test "$DISTRO" != "fedora" -a "$DISTRO" != "centos" -a "$DISTRO" != "rhel"; then exit 0 fi - ## Install any setup-time deps # We need these for the build sudo yum install -y python-devel epydoc python-setuptools systemd-units diff --git a/tcmu-runner/build/build_rpm b/tcmu-runner/build/build_rpm index 784f9f67..8c60039f 100644 --- a/tcmu-runner/build/build_rpm +++ b/tcmu-runner/build/build_rpm @@ -1,12 +1,13 @@ #! /usr/bin/bash set -ex +BRANCH=`branch_slash_filter $BRANCH` + # Only do actual work when we are an RPM distro if test "$DISTRO" != "fedora" -a "$DISTRO" != "centos" -a "$DISTRO" != "rhel"; then exit 0 fi - ## Install any setup-time deps # We need these for the build sudo yum install -y cmake kernel-headers glib2-devel libnl3-devel \ @@ -257,7 +258,7 @@ fpm -s dir -t rpm -n libtcmu-devel -C ${DESTDIR} \ ## Upload the created RPMs to chacra -chacra_endpoint="python-rtslib/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" +chacra_endpoint="tcmu-runner/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" -- 2.47.3