From: Kefu Chai <kchai@redhat.com>
Date: Fri, 7 Jun 2019 15:08:53 +0000 (+0800)
Subject: ceph-dev-new*: build "crimson" flavor for octopus and master
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=269062db5ee44fd4fb0deac92928bd619a827872;p=ceph-build.git

ceph-dev-new*: build "crimson" flavor for octopus and master

* add "crimson" as another flavor
* build "default", "notcmalloc" flavors for branches whose name
  match jewel, kraken, luminous, mimic, nautilus
* build "default", "notcmalloc" and "crimson" flavors for branches whose name
  does not match any of jewel, kraken, luminous, mimic, nautilus.
  and build "crimson" on bionic only, because the "ubuntu-toolchain-r"
  PPA offers GCC-9, which is the latest GCC release at the time of
  writing. we want to target the mainstream hardware and toolchain
  available at least 1 year later. by then, GCC-9 will be available
  in most distros. and hopefully, it will be included by the
  devtoolset-9.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index da726b386..a2dc3f43b 100644
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -51,7 +51,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\)'
+            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\)' | grep '\(mimic\|nautilus\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -70,6 +70,34 @@
                     FORCE=True
                     DISTROS=centos7
                     FLAVOR=notcmalloc
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\|mimic\|nautilus\)'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=bionic xenial centos7
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos7
+                    FLAVOR=notcmalloc
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=bionic
+                    FLAVOR=crimson
 
     wrappers:
       - inject-passwords:
diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index 2dd2e1ea7..62fff4dba 100644
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -56,8 +56,9 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           choices:
             - default
             - notcmalloc
+            - crimson
           default: "default"
-          description: "Type of Ceph build, choices are: notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
+          description: "Type of Ceph build, choices are: crimson, notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
 
     builders:
       - multijob: