From 25c9cf32ff406abaf2e11277283d6406269ae53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 20 May 2024 14:38:46 +0200 Subject: [PATCH] Revert "ci: azure: Workaround azure cli installation script" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5ff53e4d1cb94cef04477e36135b932edd28e077, as the script was fixed by MSFT, at least according to: https://github.com/Azure/azure-cli/issues/28984 Signed-off-by: Fabiano Fidêncio --- tests/gha-run-k8s-common.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 204c66587a..9a2244ebff 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -62,14 +62,7 @@ function enable_cluster_http_application_routing() { } function install_azure_cli() { - # This is a workaround for https://github.com/Azure/azure-cli/issues/28984 - # which ended up breaking our CI. - curl -sL https://aka.ms/InstallAzureCLIDeb -o installAzureCli.sh - sed -i '/curl -sLS https:\/\/packages.microsoft.com\/keys\/microsoft.asc |/d' installAzureCli.sh - sed -i '/gpg --dearmor -o \/etc\/apt\/keyrings\/microsoft.gpg/d' installAzureCli.sh - sed -i '/chmod go+r \/etc\/apt\/keyrings\/microsoft.gpg/d' installAzureCli.sh - sudo bash installAzureCli.sh - + curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash # The aks-preview extension is required while the Mariner Kata host is in preview. az extension add --name aks-preview }