From f76a559c188e8e5a20da8b5e1f27794c808f703d Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 29 Sep 2020 08:29:14 +0000 Subject: [PATCH] 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 --- ceph-dev-new/config/definitions/ceph-dev-new.yml | 6 ++++++ ceph-dev/config/definitions/ceph-dev.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index 2fde222b..ead4f5e4 100644 --- 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 6bc8d50e..c2ee4ce9 100644 --- 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 -- 2.39.5