From 50e7dc571c0f21aa30a35e5e88d5c4328d9db3db Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 25 Jun 2024 18:33:37 +0200 Subject: [PATCH] ci-automation: Drop azure auth flags --- ci-automation/garbage_collect_cloud.sh | 2 +- ci-automation/release.sh | 2 -- ci-automation/vendor-testing/azure.sh | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci-automation/garbage_collect_cloud.sh b/ci-automation/garbage_collect_cloud.sh index 8c038399aa..a3e105ba9f 100755 --- a/ci-automation/garbage_collect_cloud.sh +++ b/ci-automation/garbage_collect_cloud.sh @@ -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 \ diff --git a/ci-automation/release.sh b/ci-automation/release.sh index 65be545ef3..6035d81d7f 100644 --- a/ci-automation/release.sh +++ b/ci-automation/release.sh @@ -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}" \ @@ -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" \ diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index bc7adf16ae..069b3b3480 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -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}" \