Skip to content

Commit 3559409

Browse files
Revert "Fixup FIPS Makefile/E2E"
This reverts commit f67241a.
1 parent 28b5101 commit 3559409

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ sub-push: all-image-registry push-manifest
194194

195195
.PHONY: sub-push-fips
196196
sub-push-fips:
197-
$(MAKE) FIPS=true TAG=$(TAG)-fips sub-push
197+
$(MAKE) FIPS=true sub-push
198198

199199
.PHONY: sub-push-a1compat
200200
sub-push-a1compat:

hack/e2e/build-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function build_and_push() {
6464
export ALL_OS="linux"
6565
export ALL_ARCH_linux="${IMAGE_ARCH}"
6666
fi
67-
make -j $(nproc) sub-push
67+
make -j $(nproc) all-push
6868

6969
loudecho "Image pushed to ${IMAGE_NAME}:${IMAGE_TAG}"
7070
}

hack/e2e/test-images.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/bin/bash
2+
13
# Copyright 2025 The Kubernetes Authors.
24
#
35
# Licensed under the Apache License, Version 2.0 (the 'License');
@@ -34,10 +36,10 @@ function build_and_push() {
3436
MAX_IMAGES=10000
3537
IMAGE_COUNT=$(aws ecr list-images --repository-name "${IMAGE##*/}" --region "${REGION}" --query 'length(imageIds[])')
3638

37-
if [ $IMAGE_COUNT -ge $MAX_IMAGES ]; then
38-
loudecho "Repository image limit reached. Unable to push new images."
39-
exit 1
40-
fi
39+
# if [ $IMAGE_COUNT -ge $MAX_IMAGES ]; then
40+
# loudecho "Repository image limit reached. Unable to push new images."
41+
# exit 1
42+
# fi
4143

4244
loudecho "Building and pushing test driver images to ${IMAGE}:${IMAGE_TAG}"
4345
aws ecr get-login-password --region "${REGION}" | docker login --username AWS --password-stdin "${AWS_ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com"

0 commit comments

Comments
 (0)