Skip to content

Commit 43af41a

Browse files
authored
Merge pull request #3483 from k8s-infra-cherrypick-robot/cherry-pick-3482-to-release-1.8
[release-1.8] Revert change to reuse artifacts for Windows
2 parents 86700a1 + 6997f55 commit 43af41a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/ci-build-azure-ccm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ can_reuse_artifacts() {
8282
fi
8383
done
8484

85-
if ! docker manifest inspect "${REGISTRY}/${CNM_IMAGE_NAME}:${IMAGE_TAG_CNM}" | grep -q "\"os.version\": \"${WINDOWS_IMAGE_VERSION}\""; then
85+
FULL_VERSION=$(docker manifest inspect mcr.microsoft.com/windows/nanoserver:${WINDOWS_IMAGE_VERSION} | jq -r '.manifests[0].platform["os.version"]')
86+
if ! docker manifest inspect "${REGISTRY}/${CNM_IMAGE_NAME}:${IMAGE_TAG_CNM}" | grep -q "\"os.version\": \"${FULL_VERSION}\""; then
8687
echo "false" && return
8788
fi
8889

0 commit comments

Comments
 (0)