Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in latest mantle, drop obsolete auth flags #2063

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci-automation/garbage_collect_cloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source ci-automation/ci_automation_common.sh
timeout --signal=SIGQUIT 60m ore aws gc --access-id "${AWS_ACCESS_KEY_ID}" --secret-key "${AWS_SECRET_ACCESS_KEY}"
timeout --signal=SIGQUIT 60m ore do gc --config-file=<(echo "${DIGITALOCEAN_TOKEN_JSON}" | base64 --decode)
timeout --signal=SIGQUIT 60m ore gcloud gc --json-key <(echo "${GCP_JSON_KEY}" | base64 --decode)
timeout --signal=SIGQUIT 60m ore azure gc --duration 6h --azure-identity
timeout --signal=SIGQUIT 60m ore azure gc --duration 6h
timeout --signal=SIGQUIT 60m ore equinixmetal gc --duration 6h \
--project="${EQUINIXMETAL_PROJECT}" --gs-json-key=<(echo "${GCP_JSON_KEY}" | base64 --decode) --api-key="${EQUINIXMETAL_KEY}"
timeout --signal=SIGQUIT 60m ore openstack gc --duration 6h \
Expand Down
2 changes: 0 additions & 2 deletions ci-automation/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ function _inside_mantle() {
--debug \
--platform="${platform}" \
--aws-credentials="${aws_credentials_config_file}" \
--azure-identity \
--gce-json-key=none \
--board="${arch}-usr" \
--channel="${CHANNEL}" \
Expand Down Expand Up @@ -137,7 +136,6 @@ function _inside_mantle() {
--publish-marketplace \
--access-role-arn="${AWS_MARKETPLACE_ARN}" \
--product-ids="${pid}" \
--azure-identity \
--gce-json-key="${gcp_json_key_path}" \
--gce-release-key="${google_release_credentials_file}" \
--board="${arch}-usr" \
Expand Down
1 change: 0 additions & 1 deletion ci-automation/vendor-testing/azure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ run_kola_tests() {
--platform=azure \
--azure-image-file="${AZURE_IMAGE_NAME}" \
--azure-location="${AZURE_LOCATION}" \
--azure-identity \
--tapfile="${instance_tapfile}" \
--azure-size="${instance_type}" \
--azure-hyper-v-generation="${hyperv_gen}" \
Expand Down
2 changes: 1 addition & 1 deletion sdk_container/.repo/manifests/mantle-container
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ghcr.io/flatcar/mantle:git-60de9ff9f3d070f73c2cd69bdfdc088ea0d9f0f9
ghcr.io/flatcar/mantle:git-3321b584ff11c5cab13bde61398c30b4d205b999
Loading