From ae919d2fb2bb73a62ee64bba0bbc645b59424748 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 18 May 2017 20:57:28 +0200 Subject: [PATCH] samba: Strip out origin/ for CEPH_BRANCH When we pass the CEPH_BRANCH from ceph-dev-build, it contains origin/, 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 --- samba/build/setup | 4 ++++ samba/config/definitions/samba.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/samba/build/setup b/samba/build/setup index 41939805..1449e3de 100644 --- 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 57aec7d9..ce96769c 100644 --- 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 -- 2.39.5