ceph-dev, ceph-dev-new: copy branch artifact too for short name

BRANCH is set by the github plugin to, say, origin/master.  The
-setup jobs change that back to just 'master', so, copy their
saved env-setting artifact 'branch' as well so the parent job
can also use the short branch name in its build name.

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index 2fde222bd0f40e2fb1cd595258a0430c0140622e..ead4f5e419d11d5215ef2decc0f088ff59ab5bf3 100644 (file)
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -94,6 +94,12 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           which-build: multijob-build
       - inject:
           properties-file: ${WORKSPACE}/dist/sha1
+      - copyartifact:
+          project: ceph-dev-new-setup
+          filter: dist/branch
+          which-build: multijob-build
+      - inject:
+          properties-file: ${WORKSPACE}/dist/branch
       - multijob:
           name: 'ceph dev build phase'
           condition: SUCCESSFUL

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 6bc8d50e06a131fb536d18fbc3ad2d7fcf1d64f6..c2ee4ce9b04ff6d7ba870e717e6796616a77e767 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -94,6 +94,12 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           which-build: multijob-build
       - inject:
           properties-file: ${WORKSPACE}/dist/sha1
+      - copyartifact:
+          project: ceph-dev-setup
+          filter: dist/branch
+          which-build: multijob-build
+      - inject:
+          properties-file: ${WORKSPACE}/dist/branch
       - multijob:
           name: 'ceph dev build phase'
           condition: SUCCESSFUL