Merge pull request #5972 from willie-yao/fix-dalec-spec

Fix issue with revision substitution in dalec test template

Author: k8s-ci-robot

templates/test/ci/cluster-template-prow-dalec-custom-builds.yaml

@@ -105,7 +105,8 @@ spec:
 
           for BINARY in "$${BINARIES[@]}"; do
             echo "* downloading and extracting binary: $${BINARY} $${VERSION}"
-            REVISION=$${$${BINARY^^}_REVISION}
+            BINARY_VAR="$${BINARY^^}_REVISION"
+            REVISION=$${!BINARY_VAR}
             RPM_FILE="/tmp/$${BINARY}-$${VERSION}-$${REVISION}.$${OS_VERSION}.$${ARCH}.rpm"
             RPM_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}-$${VERSION}-$${REVISION}.$${OS_VERSION}.$${ARCH}.rpm"
 

templates/test/ci/prow-dalec-custom-builds/patches/azl3-machine-deployment.yaml

@@ -15,7 +15,8 @@
       OS_VERSION="ubuntu24.04"
       ARCH="amd64"
       for BINARY in "$${BINARIES[@]}"; do
-        DEB_VERSION=$${$${BINARY^^}_REVISION}
+        BINARY_VAR="$${BINARY^^}_REVISION"
+        DEB_VERSION=$${!BINARY_VAR}
         echo "* downloading and extracting binary: $${BINARY} $${VERSION} with deb version $${DEB_VERSION}"
         DEB_FILE="/tmp/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"
         DEB_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"

templates/test/ci/prow-dalec-custom-builds/patches/control-plane-custom-builds.yaml

@@ -15,7 +15,8 @@
       OS_VERSION="ubuntu24.04"
       ARCH="amd64"
       for BINARY in "$${BINARIES[@]}"; do
-        DEB_VERSION=$${$${BINARY^^}_REVISION}
+        BINARY_VAR="$${BINARY^^}_REVISION"
+        DEB_VERSION=$${!BINARY_VAR}
         echo "* downloading and extracting binary: $${BINARY} $${VERSION} with deb version $${DEB_VERSION}"
         DEB_FILE="/tmp/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"
         DEB_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}_$${VERSION}-$${DEB_VERSION}_$${ARCH}.deb"