From e2c78104942693b2324dcdf227e59bf403ac5c44 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 23 Aug 2019 21:19:40 -0700 Subject: [PATCH] ceph-dev-new-*: add CONTAINER_BRANCH and check it out In case a container build is needed, check out $CONTAINER_BRANCH of ceph-container.git to use to build it Signed-off-by: Dan Mick --- .../config/definitions/ceph-dev-new-build.yml | 10 ++++++++++ ceph-dev-new/config/definitions/ceph-dev-new.yml | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index c574929b..cf9b28e2 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -14,6 +14,16 @@ days-to-keep: 30 artifact-days-to-keep: 30 + scm: + - git: + url: git@github.com:ceph/ceph-container.git + basedir: ceph-container + credentials-id: 'jenkins-build' + branches: + - $CONTAINER_BRANCH + skip-tag: true + wipe-workspace: true + execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index 2eee9c73..93ae2c95 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -60,6 +60,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if default: "default" description: "Type of Ceph build, choices are: crimson, notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'" + - string: + name: CONTAINER_BRANCH + description: "For CI_CONTAINER: Branch of ceph-container to use" + default: master + builders: - multijob: name: 'ceph dev setup phase' -- 2.39.5