Merge pull request #3482 from CecileRobertMichon/revert-win-img-reuse

Revert change to reuse artifacts for Windows
kubernetes-sigs · Apr 26, 2023 · e1e1a12 · e1e1a12
2 parents 6a23251 + b6563ee
commit e1e1a12
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/ci-build-azure-ccm.sh b/scripts/ci-build-azure-ccm.sh
@@ -82,7 +82,8 @@ can_reuse_artifacts() {
         fi
     done
 
-    if ! docker manifest inspect "${REGISTRY}/${CNM_IMAGE_NAME}:${IMAGE_TAG_CNM}" | grep -q "\"os.version\": \"${WINDOWS_IMAGE_VERSION}\""; then
+    FULL_VERSION=$(docker manifest inspect mcr.microsoft.com/windows/nanoserver:${WINDOWS_IMAGE_VERSION} | jq -r '.manifests[0].platform["os.version"]')
+    if ! docker manifest inspect "${REGISTRY}/${CNM_IMAGE_NAME}:${IMAGE_TAG_CNM}" | grep -q "\"os.version\": \"${FULL_VERSION}\""; then
         echo "false" && return
     fi