ceph-dev-new-trigger: "fix" conditional step for all other branches

Signed-off-by: David Galloway <dgallowa@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 044cd386bf029ea3c507bbcefeda86d35d2ef564..040439edbc29512b6b8ba166c9d419c3d831ae58 100644 (file)
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -103,12 +103,13 @@
                     FORCE=True
                     DISTROS=centos7
                     FLAVOR=notcmalloc
-      # If no release name is found in branch, build on all possible distro/flavor combos
+      # If no release name is found in branch, build on all possible distro/flavor combos.
+      # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is.
       - conditional-step:
-          condition-kind: regex-match
-          regex: .*(luminous|mimic|nautilus).*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: run
+          condition-kind: shell
+          condition-command: |
+            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\)'
+          on-evaluation-failure: dont-run
           steps:
             - shell:
                 !include-raw: