From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 19 Jul 2019 17:17:42 +0000 (-0400)
Subject: ceph-dev-trigger: add conditional step for master and octopus
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f0a32e31d7edcacb6f694dd659161377eb6c7aee;p=ceph-build.git

ceph-dev-trigger: add conditional step for master and octopus

Signed-off-by: Alfredo Deza <adeza@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 fb1f6aec..9d3a9778 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -38,6 +38,28 @@
           wipe-workspace: true
 
     builders:
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*(master|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
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos7
+                    FLAVOR=notcmalloc
       - conditional-step:
           condition-kind: regex-match
           regex: .*(jewel|kraken|luminous).*
@@ -61,7 +83,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\)'
+            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\|master|octopus\)'
           on-evaluation-failure: dont-run
           steps:
             - shell: