PR 2315 added 'include-raw' which is deprecated

should use include-raw-verbatim.  Also, {} must be doubled.

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index da4276b6fe4f21ce581154dd2d6f367c51e7ffd3..b614f1e785eeee3554bc294f151ce8b2af75ccd7 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -96,22 +96,22 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*tentacle.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
-                !include-raw:
+                !include-raw-verbatim:
                 - ../../../scripts/build_utils.sh
                 - ../../build/notify
             - trigger-builds:
                 - project: 'ceph-dev'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=jammy centos9 windows
                 - project: 'ceph-dev'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson

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 2543aa4c9b0db940a6fb7080f8b9f5868ef6812f..807766d34432b49dc83e70d6b311884df31238a9 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
@@ -87,22 +87,22 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*tentacle.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
-                !include-raw:
+                !include-raw-verbatim:
                 - ../../../scripts/build_utils.sh
                 - ../../build/notify
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=jammy centos9 windows
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson