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 <dan.mick@redhat.com>

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 c574929b1624a614cd12036427392b33eada4a2d..cf9b28e2dd1becfdfa7ffffcda3c2869b23dba91 100644 (file)
--- 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 2eee9c732e5bb9fb0543cf34f0bf8fd31419b395..93ae2c95e0fb14b48ae5ca26c995aceef3e556f1 100644 (file)
--- 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'