samba: Strip out origin/ for CEPH_BRANCH

When we pass the CEPH_BRANCH from ceph-dev-build, it contains
origin/<branch>, we need to strip out the remote from the CEPH_BRANCH
before we can use it.

Also set BRANCH to SAMBA_BRANCH since we use BRANCH to post to chacra.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/samba/build/setup b/samba/build/setup
index 41939805af3c6bb7e1ae7953ee9fec535907bb01..1449e3de98883c1f6bc7169deaa1892ce5407ae5 100644 (file)
--- a/samba/build/setup
+++ b/samba/build/setup
@@ -38,6 +38,10 @@ export LC_ALL=C # the following is vulnerable to i18n
 pkgs=( "chacractl>=0.0.4" )
 install_python_packages "pkgs[@]"
 
+SAMBA_BRANCH=$(branch_slash_filter $SAMBA_BRANCH)
+CEPH_BRANCH=$(branch_slash_filter $CEPH_BRANCH)
+BRANCH=${SAMBA_BRANCH}
+
 # ask shaman which chacra instance to use
 chacra_url=`curl -f -u $SHAMAN_API_USER:$SHAMAN_API_KEY https://shaman.ceph.com/api/nodes/next/`
 # create the .chacractl config file using global variables

diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml
index 57aec7d91c5bc39b6451fe26b98338170fc64205..ce96769c7fbe273e6767f3e9b590b41550855b12 100644 (file)
--- a/samba/config/definitions/samba.yml
+++ b/samba/config/definitions/samba.yml
@@ -89,7 +89,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           # Use the SSH key attached to the ceph-jenkins GitHub account.
           credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
           branches:
-            - $BRANCH
+            - $SAMBA_BRANCH
           skip-tag: true
           wipe-workspace: true