From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 14 Feb 2025 03:11:49 +0000 (-0800)
Subject: Update all jobs with ${VAR} syntax to ${{VAR}} for jjb6 compatibility
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=847650dec0d4366fe85d3645c3a80cf97b10b99c;p=ceph-build.git

Update all jobs with ${VAR} syntax to ${{VAR}} for jjb6 compatibility

jenkins-job-builder 6 changed the interpretation of {var} to *always*
refer to a jjb macro; this is true even for ${VAR}, which we use in a
lot of place for Jenkins variable expansion (although not all; it's
unclear whether the {} are or ever were necessary, or in what exact
contexts).  So far, we've pinned jjb to <6, but we need new
functionality.

In any event, rather than changing all of them to the same {}-less style
that might work, change the ${} style to ${{}} and leave $ alone.

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

diff --git a/attic/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml b/attic/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml
index a7d4bdf9..3bbdd5a4 100644
--- a/attic/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml
+++ b/attic/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml
@@ -138,4 +138,4 @@
               username: CONTAINER_REPO_USERNAME
               password: CONTAINER_REPO_PASSWORD
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${DISTROS}, ${ARCH}, ${FLAVOR}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{DISTROS}}, ${{ARCH}}, ${{FLAVOR}}"
diff --git a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
index 346954d5..d92deaa0 100644
--- a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
+++ b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
@@ -41,8 +41,8 @@
       - git:
           url: https://github.com/ceph/ceph-build.git
           branches:
-            - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - ${{sha1}}
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 9ef1f112..039483ee 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -63,10 +63,10 @@
               condition-operands:
                 - condition-kind: regex-match
                   regex: (reef|squid)
-                  label: '${BRANCH}'
+                  label: '${{BRANCH}}'
                 - condition-kind: regex-match
                   regex: (focal|jammy|centos9|buster|bullseye|bookworm)
-                  label: '${DIST}'
+                  label: '${{DIST}}'
           on-evaluation-failure: dont-run
           steps:
             - shell: |
@@ -79,9 +79,9 @@
                 filter: 'ceph-build/ansible/ceph/dist/**'
                 which-build: multijob-build
             - inject:
-                properties-file: ${WORKSPACE}/ceph-build/ansible/ceph/dist/sha1
+                properties-file: ${{WORKSPACE}}/ceph-build/ansible/ceph/dist/sha1
             - inject:
-                properties-file: ${WORKSPACE}/ceph-build/ansible/ceph/dist/other_envvars
+                properties-file: ${{WORKSPACE}}/ceph-build/ansible/ceph/dist/other_envvars
             # debian build scripts
             - shell:
                 !include-raw-verbatim:
@@ -109,7 +109,7 @@
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
                 - shell:
                     !include-raw-verbatim:
                   - ../../../scripts/build_utils.sh
diff --git a/ceph-cbt-lint/config/definitions/ceph-cbt-lint.yml b/ceph-cbt-lint/config/definitions/ceph-cbt-lint.yml
index cbacf1c0..899f81fe 100644
--- a/ceph-cbt-lint/config/definitions/ceph-cbt-lint.yml
+++ b/ceph-cbt-lint/config/definitions/ceph-cbt-lint.yml
@@ -44,8 +44,8 @@
       - git:
           url: https://github.com/ceph/cbt
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           timeout: 20
           shallow-clone: true
           wipe-workspace: true
@@ -56,7 +56,7 @@
           . venv/bin/activate
           pip install tox
           pip install git+https://github.com/ceph/githubcheck.git
-          sha1=$(git rev-parse refs/remotes/origin/pr/${ghprbPullId}/head)
+          sha1=$(git rev-parse refs/remotes/origin/pr/${{ghprbPullId}}/head)
           tox -e pep8 | github-check   \
             --lint                        \
             --lint-tox-dir=.              \
diff --git a/ceph-dashboard-cephadm-e2e/config/definitions/ceph-dashboard-cephadm-e2e.yml b/ceph-dashboard-cephadm-e2e/config/definitions/ceph-dashboard-cephadm-e2e.yml
index 9d3df16b..25500572 100644
--- a/ceph-dashboard-cephadm-e2e/config/definitions/ceph-dashboard-cephadm-e2e.yml
+++ b/ceph-dashboard-cephadm-e2e/config/definitions/ceph-dashboard-cephadm-e2e.yml
@@ -56,8 +56,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -108,4 +108,4 @@
                 - FAILURE
                 - ABORTED
               build-steps:
-                - shell: "${WORKSPACE}/ceph-build/ceph-dashboard-cephadm-e2e/build/cleanup"
+                - shell: "${{WORKSPACE}}/ceph-build/ceph-dashboard-cephadm-e2e/build/cleanup"
diff --git a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
index 5c82d257..aa2cc796 100644
--- a/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
+++ b/ceph-dashboard-pull-requests/config/definitions/ceph-dashboard-pull-requests.yml
@@ -53,8 +53,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -68,8 +68,8 @@
             - ../../../scripts/dashboard/install-e2e-test-deps.sh
       - shell: |
           export CYPRESS_ARGS="--record --key $CYPRESS_RECORD_KEY --tag $ghprbTargetBranch" COMMIT_INFO_MESSAGE="$ghprbPullTitle"
-          export APPLITOOLS_BATCH_ID="PR-${ghprbPullId}_${BUILD_TAG}"
-          export APPLITOOLS_BATCH_NAME="PR-${ghprbPullId}"
+          export APPLITOOLS_BATCH_ID="PR-${{ghprbPullId}}_${{BUILD_TAG}}"
+          export APPLITOOLS_BATCH_NAME="PR-${{ghprbPullId}}"
           export APPLITOOLS_BRANCH_NAME="$ghprbSourceBranch"
           export APPLITOOLS_PARENT_BRANCH_NAME="$ghprbTargetBranch"
           mkdir -p .applitools
diff --git a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
index fa273308..17bc0dcc 100644
--- a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
+++ b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
@@ -7,7 +7,7 @@
       - git:
           url: https://github.com/ceph/ceph-deploy.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index ca51eabe..8165f47d 100644
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -71,11 +71,11 @@
           filter: 'dist/**'
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/dist/sha1
+          properties-file: ${{WORKSPACE}}/dist/sha1
       - inject:
-          properties-file: ${WORKSPACE}/dist/branch
+          properties-file: ${{WORKSPACE}}/dist/branch
       - inject:
-          properties-file: ${WORKSPACE}/dist/other_envvars
+          properties-file: ${{WORKSPACE}}/dist/other_envvars
       # debian build scripts
       - shell:
           !include-raw-verbatim:
@@ -120,7 +120,7 @@
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
                 - shell:
                     !include-raw-verbatim:
                       - ../../../scripts/build_utils.sh
@@ -146,4 +146,4 @@
               username: DOCKER_HUB_USERNAME
               password: DOCKER_HUB_PASSWORD
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}, ${DISTROS}, ${FLAVOR}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{SHA1}}, ${{DISTROS}}, ${{FLAVOR}}"
diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index 45d4e74f..bcb894d1 100644
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -43,7 +43,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*reef.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -53,12 +53,12 @@
             - trigger-builds:
                 - project: 'ceph-dev'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=jammy focal centos9 windows
                 - project: 'ceph-dev'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson
@@ -69,7 +69,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*squid.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -79,12 +79,12 @@
             - 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
@@ -95,7 +95,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*main.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -105,12 +105,12 @@
             - 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-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index 015dbb10..c45fdd86 100644
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -78,11 +78,11 @@
           which-build: build-param
           param: SETUP_BUILD_ID
       - inject:
-          properties-file: ${WORKSPACE}/dist/sha1
+          properties-file: ${{WORKSPACE}}/dist/sha1
       - inject:
-          properties-file: ${WORKSPACE}/dist/branch
+          properties-file: ${{WORKSPACE}}/dist/branch
       - inject:
-          properties-file: ${WORKSPACE}/dist/other_envvars
+          properties-file: ${{WORKSPACE}}/dist/other_envvars
       # debian build scripts
       - shell:
           !include-raw-verbatim:
@@ -128,7 +128,7 @@
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
                 - shell:
                     !include-raw-verbatim:
                       - ../../../scripts/build_utils.sh
@@ -158,4 +158,4 @@
               username: AWS_ACCESS_KEY_ID
               password: AWS_SECRET_ACCESS_KEY
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}, ${DISTROS}, ${FLAVOR}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{SHA1}}, ${{DISTROS}}, ${{FLAVOR}}"
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 9c6af24c..7a4a3c7a 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
@@ -33,7 +33,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*reef.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -43,12 +43,12 @@
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=jammy focal centos9 windows
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson
@@ -59,7 +59,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*squid.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -69,12 +69,12 @@
             - 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
@@ -84,7 +84,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
+            echo "${{GIT_BRANCH}}" | grep -v '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -94,13 +94,13 @@
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=jammy centos9 windows
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson
@@ -109,7 +109,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*centos9-only.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -119,7 +119,7 @@
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     ARCHS=x86_64
@@ -129,7 +129,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*crimson-only.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -139,7 +139,7 @@
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson
@@ -150,7 +150,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*jaeger.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell:
@@ -160,7 +160,7 @@
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
+                    BRANCH=${{GIT_BRANCH}}
                     FORCE=True
                     DISTROS=centos8 focal
                     FLAVOR=jaeger
@@ -169,7 +169,7 @@
       - conditional-step:
           condition-kind: regex-match
           regex: .*sccache.*
-          label: '${GIT_BRANCH}'
+          label: '${{GIT_BRANCH}}'
           on-evaluation-failure: dont-run
           steps:
             - shell: echo skipping
diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index a327fd70..39371db5 100644
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -94,13 +94,13 @@
           filter: dist/sha1
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/dist/sha1
+          properties-file: ${{WORKSPACE}}/dist/sha1
       - copyartifact:
           project: ceph-dev-new-setup
           filter: dist/branch
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/dist/branch
+          properties-file: ${{WORKSPACE}}/dist/branch
       - multijob:
           name: 'ceph dev build phase'
           condition: SUCCESSFUL
@@ -114,4 +114,4 @@
           global: true
           mask-password-params: true
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}, ${DISTROS}, ${FLAVOR}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{SHA1}}, ${{DISTROS}}, ${{FLAVOR}}"
diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index ed42f133..c6b805fa 100644
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -9,7 +9,7 @@
         - git:
             url: https://github.com/ceph/ceph-build
             branches:
-              - ${CEPH_BUILD_BRANCH}
+              - ${{CEPH_BUILD_BRANCH}}
             shallow-clone: true
             submodule:
               disable: true
diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index ad3b0667..7c36a5a0 100644
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -85,13 +85,13 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           filter: dist/sha1
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/dist/sha1
+          properties-file: ${{WORKSPACE}}/dist/sha1
       - copyartifact:
           project: ceph-dev-setup
           filter: dist/branch
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/dist/branch
+          properties-file: ${{WORKSPACE}}/dist/branch
       - multijob:
           name: 'ceph dev build phase'
           condition: SUCCESSFUL
@@ -105,4 +105,4 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           global: true
           mask-password-params: true
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}, ${DISTROS}, ${FLAVOR}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{SHA1}}, ${{DISTROS}}, ${{FLAVOR}}"
diff --git a/ceph-devstack/config/definitions/ceph-devstack.yml b/ceph-devstack/config/definitions/ceph-devstack.yml
index 113142eb..2f828c94 100644
--- a/ceph-devstack/config/definitions/ceph-devstack.yml
+++ b/ceph-devstack/config/definitions/ceph-devstack.yml
@@ -8,7 +8,7 @@
         - git:
             url: https://github.com/zmc/ceph-devstack
             branches:
-              - origin/${CEPH_DEVSTACK_BRANCH}
+              - origin/${{CEPH_DEVSTACK_BRANCH}}
     parameters:
       - string:
           name: CEPH_DEVSTACK_BRANCH
diff --git a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
index b5f1fe8f..bda572c8 100644
--- a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
+++ b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml
@@ -55,4 +55,4 @@
               username: CONTAINER_REPO_USERNAME
               password: CONTAINER_REPO_PASSWORD
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}"
diff --git a/ceph-grafana/config/definitions/ceph-grafana.yml b/ceph-grafana/config/definitions/ceph-grafana.yml
index 80cb2c53..77828e20 100644
--- a/ceph-grafana/config/definitions/ceph-grafana.yml
+++ b/ceph-grafana/config/definitions/ceph-grafana.yml
@@ -47,4 +47,4 @@
               username: CONTAINER_REPO_USERNAME
               password: CONTAINER_REPO_PASSWORD
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${ARCH}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{ARCH}}"
diff --git a/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml b/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
index cf2e662a..369e77fa 100644
--- a/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
+++ b/ceph-iscsi-cli-flake8/config/definitions/ceph-iscsi-config-flake8.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/ceph-iscsi-cli.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
index 281eb864..cc9401dc 100644
--- a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
+++ b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
@@ -33,5 +33,5 @@
       - trigger-builds:
         - project: 'ceph-iscsi-cli'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
index c43862d6..7f76a157 100644
--- a/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
+++ b/ceph-iscsi-config-flake8/config/definitions/ceph-iscsi-config-flake8.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/ceph-iscsi-config.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
index b8d46cde..481bda7a 100644
--- a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
+++ b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
@@ -33,5 +33,5 @@
       - trigger-builds:
         - project: 'ceph-iscsi-config'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
index 5e165d1b..f4e526fd 100644
--- a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
+++ b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
@@ -126,7 +126,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
                 - shell:
                     !include-raw-verbatim:
                       - ../../../scripts/build_utils.sh
diff --git a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
index 711c5ebd..8cb0896e 100644
--- a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
+++ b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
@@ -33,5 +33,5 @@
       - trigger-builds:
         - project: 'ceph-iscsi-tools'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
index 80878ac7..324d880b 100644
--- a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
+++ b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/ceph-iscsi.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml
index 65fd7707..23d04569 100644
--- a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml
+++ b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml
@@ -33,5 +33,5 @@
       - trigger-builds:
         - project: 'ceph-iscsi'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
index d58808b2..7aea419e 100644
--- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
+++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
@@ -19,8 +19,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           timeout: 20
           basedir: "ceph-pr"
           shallow-clone: true
diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index 70f1d30d..dd47e3cd 100644
--- a/ceph-pr-api/config/definitions/ceph-pr-api.yml
+++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml
@@ -54,8 +54,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
index 32d92338..38fa5446 100644
--- a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
@@ -4,8 +4,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - ${{sha1}}
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
index 2d11cbb9..9fcc6e12 100644
--- a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
+++ b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
@@ -37,8 +37,8 @@
           url: https://github.com/ceph/ceph
           browser: auto
           branches:
-            - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - ${{sha1}}
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           skip-tag: true
           shallow-clone: true
           honor-refspec: true
diff --git a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
index f65e3298..546c24ed 100644
--- a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
@@ -41,8 +41,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - ${sha1}
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - ${{sha1}}
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
index 4b7ea0bb..624fa8c2 100644
--- a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
+++ b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
@@ -42,8 +42,8 @@
         url: https://github.com/ceph/ceph.git
         name: origin
         branches:
-          - origin/pr/${ghprbPullId}/merge
-        refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+          - origin/pr/${{ghprbPullId}}/merge
+        refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
         skip-tag: true
         shallow-clone: true
         honor-refspec: true
diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
index 66badca7..8cef990c 100644
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -50,8 +50,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
diff --git a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
index de9f9aa6..fde5cf49 100644
--- a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
+++ b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
@@ -49,7 +49,7 @@
       - git:
           url: https://github.com/ceph/ceph-qa-suite.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/ceph-rook-e2e/config/definitions/ceph-orchestrator-rook-e2e.yml b/ceph-rook-e2e/config/definitions/ceph-orchestrator-rook-e2e.yml
index d981f6e2..8adb9209 100644
--- a/ceph-rook-e2e/config/definitions/ceph-orchestrator-rook-e2e.yml
+++ b/ceph-rook-e2e/config/definitions/ceph-orchestrator-rook-e2e.yml
@@ -58,8 +58,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           skip-tag: true
@@ -96,4 +96,4 @@
                 - FAILURE
                 - ABORTED
               build-steps:
-                - shell: "${WORKSPACE}/ceph-build/ceph-rook-e2e/build/cleanup"
+                - shell: "${{WORKSPACE}}/ceph-build/ceph-rook-e2e/build/cleanup"
diff --git a/ceph-volume-unit-tests/config/definitions/ceph-volume-pr.yml b/ceph-volume-unit-tests/config/definitions/ceph-volume-pr.yml
index 0e0ca18f..4e1d7062 100644
--- a/ceph-volume-unit-tests/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-unit-tests/config/definitions/ceph-volume-pr.yml
@@ -52,7 +52,7 @@
           url: https://github.com/ceph/ceph
           browser: auto
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           skip-tag: true
           timeout: 20
diff --git a/ceph-website-prs/config/definitions/ceph-website-prs.yml b/ceph-website-prs/config/definitions/ceph-website-prs.yml
index 7b3c6271..58a5ca0f 100644
--- a/ceph-website-prs/config/definitions/ceph-website-prs.yml
+++ b/ceph-website-prs/config/definitions/ceph-website-prs.yml
@@ -36,14 +36,14 @@
           success-status: "Site compiled successfully!"
           failure-status: "Site compilation failed"
 #         This is kinda noisy if there's lots of force pushes
-#         success-comment: "Site built successfully!  https://${GIT_BRANCH}.ceph.io"
+#         success-comment: "Site built successfully!  https://${{GIT_BRANCH}}.ceph.io"
 
     scm:
       - git:
           url: https://github.com/ceph/ceph.io
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           skip-tag: true
           timeout: 20
diff --git a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
index 10863ab3..94940ac7 100644
--- a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
+++ b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
@@ -32,7 +32,7 @@
           basedir: ceph-build
 
     builders:
-      - shell: "${WORKSPACE}/ceph-build/ceph-windows-image-build/build/build"
+      - shell: "${{WORKSPACE}}/ceph-build/ceph-windows-image-build/build/build"
 
     wrappers:
       - credentials-binding:
@@ -53,4 +53,4 @@
                 - FAILURE
                 - ABORTED
               build-steps:
-                - shell: "${WORKSPACE}/ceph-build/ceph-windows-image-build/build/cleanup"
+                - shell: "${{WORKSPACE}}/ceph-build/ceph-windows-image-build/build/cleanup"
diff --git a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
index 2408445c..e8c13842 100644
--- a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
+++ b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
@@ -104,7 +104,7 @@
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
 
                 - shell:
                     !include-raw-verbatim:
diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
index 30fcd73a..b89d9ca0 100644
--- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
+++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
@@ -53,8 +53,8 @@
       - git:
           url: https://github.com/ceph/ceph.git
           branches:
-            - origin/pr/${ghprbPullId}/merge
-          refspec: +refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*
+            - origin/pr/${{ghprbPullId}}/merge
+          refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
           browser: auto
           timeout: 20
           do-not-fetch-tags: true
diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index ccfa86ee..bc302298 100644
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -109,7 +109,7 @@ SECURITY: Builds from BRANCH-release branch in ceph-private.git (private repo)."
           filter: ceph-build/ansible/ceph/dist/sha1
           which-build: multijob-build
       - inject:
-          properties-file: ${WORKSPACE}/ceph-build/ansible/ceph/dist/sha1
+          properties-file: ${{WORKSPACE}}/ceph-build/ansible/ceph/dist/sha1
       - multijob:
           name: 'ceph build phase'
           condition: SUCCESSFUL
@@ -130,4 +130,4 @@ SECURITY: Builds from BRANCH-release branch in ceph-private.git (private repo)."
           global: true
           mask-password-params: true
       - build-name:
-          name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}"
+          name: "#${{BUILD_NUMBER}} ${{BRANCH}}, ${{SHA1}}"
diff --git a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
index f657d5ee..8913992c 100644
--- a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
+++ b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
@@ -41,7 +41,7 @@
       - git:
           url: https://github.com/ceph/cephmetrics.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
index bf71640a..6f4daa7a 100644
--- a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
+++ b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/chacra
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/kernel-trigger/config/definitions/kernel-trigger.yml b/kernel-trigger/config/definitions/kernel-trigger.yml
index 1d22e476..1431f0f7 100644
--- a/kernel-trigger/config/definitions/kernel-trigger.yml
+++ b/kernel-trigger/config/definitions/kernel-trigger.yml
@@ -74,5 +74,5 @@
       - trigger-builds:
         - project: 'kernel'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
index 6c1ac4cc..9de73774 100644
--- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
+++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
@@ -50,7 +50,7 @@
       - git:
           url: https://github.com/alfredodeza/merfi.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
index da8f5aa4..14002b16 100644
--- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
+++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
@@ -177,7 +177,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
                 - shell:
                     !include-raw-verbatim:
                       - ../../../scripts/build_utils.sh
diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index 8322b4d2..92c64555 100644
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -146,7 +146,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
 
                 - shell:
                     !include-raw-verbatim:
diff --git a/paddles-pull-requests/config/definitions/paddles-pull-requests.yml b/paddles-pull-requests/config/definitions/paddles-pull-requests.yml
index d6121003..a243dbb7 100644
--- a/paddles-pull-requests/config/definitions/paddles-pull-requests.yml
+++ b/paddles-pull-requests/config/definitions/paddles-pull-requests.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/paddles
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
index 9139b09e..da57a3b0 100644
--- a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
+++ b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
@@ -7,7 +7,7 @@
       - git:
           url: https://github.com/ceph/radosgw-agent.git
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
index 6f043fd0..edd67703 100644
--- a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
+++ b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
@@ -34,5 +34,5 @@
       - trigger-builds:
         - project: 'rtslib-fb'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/samba-trigger/config/definitions/samba-trigger.yml b/samba-trigger/config/definitions/samba-trigger.yml
index 7c3e4c47..daa1b9ea 100644
--- a/samba-trigger/config/definitions/samba-trigger.yml
+++ b/samba-trigger/config/definitions/samba-trigger.yml
@@ -34,5 +34,5 @@
       - trigger-builds:
         - project: 'samba'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
index 9fdb4bce..6cf9f96e 100644
--- a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
+++ b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
@@ -4,7 +4,7 @@
       - git:
           url: https://github.com/ceph/shaman
           branches:
-            - ${sha1}
+            - ${{sha1}}
           refspec: +refs/pull/*:refs/remotes/origin/pr/*
           browser: auto
           timeout: 20
diff --git a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
index 960d27b1..b35c1537 100644
--- a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
+++ b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
@@ -34,5 +34,5 @@
       - trigger-builds:
         - project: 'tcmu-runner'
           predefined-parameters: |
-            BRANCH=${GIT_BRANCH}
+            BRANCH=${{GIT_BRANCH}}
             FORCE=True
diff --git a/wnbd-build/config/definitions/wnbd-build.yml b/wnbd-build/config/definitions/wnbd-build.yml
index 366ef7df..75c78c2f 100644
--- a/wnbd-build/config/definitions/wnbd-build.yml
+++ b/wnbd-build/config/definitions/wnbd-build.yml
@@ -84,7 +84,7 @@
                   - ABORTED
               build-steps:
                 - inject:
-                    properties-file: ${WORKSPACE}/build_info
+                    properties-file: ${{WORKSPACE}}/build_info
 
                 - shell:
                     !include-raw-verbatim: