From b6563eed3f6629d034e287cae146b737302ef05d Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Tue, 25 Apr 2023 23:43:30 +0000 Subject: [PATCH] Revert change to reuse artifacts for Windows --- scripts/ci-build-azure-ccm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci-build-azure-ccm.sh b/scripts/ci-build-azure-ccm.sh index 595e431514f..e820ae216eb 100755 --- 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