From 07274796a8fb5564197e0bd295995fced3c441cf Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 25 Oct 2024 11:42:27 +0300 Subject: [PATCH 1/2] metal: Run apt-get update before install --- tests/e2e/scenarios/bare-metal/start-vms | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/e2e/scenarios/bare-metal/start-vms b/tests/e2e/scenarios/bare-metal/start-vms index 7e4497f753e55..4ba098fd7e7f8 100755 --- a/tests/e2e/scenarios/bare-metal/start-vms +++ b/tests/e2e/scenarios/bare-metal/start-vms @@ -42,6 +42,7 @@ go build -o ${BINDIR}/storage . sudo setcap cap_net_bind_service=ep ${BINDIR}/dhcp # Install software we need +sudo apt-get update if ! genisoimage --version; then echo "Installing genisoimage" sudo apt-get install --yes genisoimage From aec463acf82f46857be71f441e27ed44c21ea26f Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 25 Oct 2024 12:16:46 +0300 Subject: [PATCH 2/2] chore: Reduce verbosity for `upload` make target --- Makefile | 2 +- hack/upload | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 55c2fa51a5349..bcb19280d7a07 100644 --- a/Makefile +++ b/Makefile @@ -246,7 +246,7 @@ crossbuild-channels: channels-amd64 channels-arm64 .PHONY: upload upload: version-dist # Upload kops to S3 - aws s3 sync --acl public-read ${UPLOAD}/ ${S3_BUCKET} + aws s3 sync --no-progress --acl public-read ${UPLOAD}/ ${S3_BUCKET} # gcs-upload builds kops and uploads to GCS .PHONY: gcs-upload diff --git a/hack/upload b/hack/upload index 7179fc4fc3d9c..f1cbb0512eb4f 100755 --- a/hack/upload +++ b/hack/upload @@ -27,7 +27,7 @@ if [[ "${DEST:0:5}" == "s3://" ]]; then if aws s3api get-bucket-ownership-controls --bucket "${bucket}" | grep -q "BucketOwnerEnforced" 2>/dev/null; then acl_flag="" fi - aws s3 sync ${acl_flag} ${SRC} ${DEST} + aws s3 sync --no-progress ${acl_flag} ${SRC} ${DEST} exit 0 fi