From 5ad2bda38f0b3324a4ecd083d9a4981307a3328f Mon Sep 17 00:00:00 2001
From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 1 Apr 2025 13:33:10 -0700
Subject: [PATCH] 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>
---
 ceph-dev-cron/config/definitions/ceph-dev-cron.yml        | 8 ++++----
 .../config/definitions/ceph-dev-new-trigger.yml           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index da4276b6..b614f1e7 100644
--- 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 2543aa4c..807766d3 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
@@ -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
-- 
2.39.5