From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Mar 2020 14:03:13 +0000 (+0800)
Subject: ceph-dev-trigger: do not build crimson for octopus
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1519%2Fhead;p=ceph-build.git

ceph-dev-trigger: do not build crimson for octopus

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

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 68308f7e4..0b4ad8889 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -112,13 +112,38 @@
                     FORCE=True
                     DISTROS=centos7
                     FLAVOR=notcmalloc
-      # build master and octopus on:
+      # build octopus on:
+      # default: bionic centos7 centos8 leap15
+      # notcmalloc: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*octopus.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=bionic centos7 centos8 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=notcmalloc
+      # build master on:
       # default: bionic centos7 centos8 leap15
       # notcmalloc: centos8
       # crimson: bionic
       - conditional-step:
           condition-kind: regex-match
-          regex: .*(master|octopus).*
+          regex: master
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps: