Use revision numbers from environment variables

Author: willie-yao

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

@@ -58,7 +58,7 @@ spec:
           # Install ca-certificates packages for Azure Linux
           tdnf install -y ca-certificates ca-certificates-legacy
           update-ca-trust
-          
+
           # Follow Azure Linux 3 docs exactly - completely permissive for debugging
           # Change default policy to ACCEPT (as recommended by AZL3 docs)
           iptables -P INPUT ACCEPT
@@ -105,8 +105,9 @@ spec:
 
           for BINARY in "$${BINARIES[@]}"; do
             echo "* downloading and extracting binary: $${BINARY} $${VERSION}"
-            RPM_FILE="/tmp/$${BINARY}-$${VERSION}-1.$${OS_VERSION}.$${ARCH}.rpm"
-            RPM_URL="$${BASE_URL}/$${BINARY}/$${VERSION}/$${OS_VERSION}/$${ARCH}/$${BINARY}-$${VERSION}-1.$${OS_VERSION}.$${ARCH}.rpm"
+            REVISION=$${$${BINARY^^}_REVISION}
+            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"
 
             echo "Downloading from: $${RPM_URL}"
             curl -L --retry 10 --retry-delay 5 "$${RPM_URL}" --output "$${RPM_FILE}"
@@ -117,7 +118,7 @@ spec:
             mkdir -p "$${TEMP_DIR}"
             cd "$${TEMP_DIR}"
             rpm2cpio "$${RPM_FILE}" | cpio -idmv
-            
+
             # Move the binary to the correct location
             if [ -f "./usr/bin/$${BINARY}" ]; then
               mv "./usr/bin/$${BINARY}" "/usr/bin/$${BINARY}"

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

@@ -15,11 +15,7 @@
       OS_VERSION="ubuntu24.04"
       ARCH="amd64"
       for BINARY in "$${BINARIES[@]}"; do
-        if [[ "$${BINARY}" == "kubelet" ]]; then
-          DEB_VERSION="ubuntu24.04u1"
-        else
-          DEB_VERSION="ubuntu24.04u2"
-        fi
+        DEB_VERSION=$${$${BINARY^^}_REVISION}
         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,11 +15,7 @@
       OS_VERSION="ubuntu24.04"
       ARCH="amd64"
       for BINARY in "$${BINARIES[@]}"; do
-        if [[ "$${BINARY}" == "kubelet" ]]; then
-          DEB_VERSION="ubuntu24.04u1"
-        else
-          DEB_VERSION="ubuntu24.04u2"
-        fi
+        DEB_VERSION=$${$${BINARY^^}_REVISION}
         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"