tcmu-runner / rtslib-fb: sanitize branch name

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

diff --git a/rtslib-fb/build/build_rpm b/rtslib-fb/build/build_rpm
index 966a499b3bb5ade987edc0af2167c4c29c65b6fe..6616490c9980b9eb01f66645584973ee1943215a 100644 (file)
--- 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 784f9f67a6eb02cf6af1f7cb2732355fdd386d55..8c60039ffe1fade3ec84a0912fc7100612e76120 100644 (file)
--- 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=""