Skip to content

Commit

Permalink
Merge pull request #16919 from hakman/metal-apt-update
Browse files Browse the repository at this point in the history
metal: Run apt-get update before install
  • Loading branch information
k8s-ci-robot authored Oct 25, 2024
2 parents 17e7cb1 + aec463a commit 93efa5f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/upload
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tests/e2e/scenarios/bare-metal/start-vms
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 93efa5f

Please # to comment.