diff --git a/.github/workflows/run-kata-coco-stability-tests.yaml b/.github/workflows/run-kata-coco-stability-tests.yaml index 38fc7cfcba..4ac9f4591e 100644 --- a/.github/workflows/run-kata-coco-stability-tests.yaml +++ b/.github/workflows/run-kata-coco-stability-tests.yaml @@ -91,9 +91,6 @@ jobs: - name: Install kata run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-artifacts - - name: Download Azure CLI - run: bash tests/integration/kubernetes/gha-run.sh install-azure-cli - - name: Log into the Azure account uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0 with: diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index 444980e91a..e71e59fd8c 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -268,9 +268,6 @@ jobs: - name: Install kata run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-artifacts - - name: Download Azure CLI - run: bash tests/integration/kubernetes/gha-run.sh install-azure-cli - - name: Log into the Azure account uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0 with: diff --git a/.github/workflows/run-kata-deploy-tests-on-aks.yaml b/.github/workflows/run-kata-deploy-tests-on-aks.yaml index 3f702e51c0..0190c8ab78 100644 --- a/.github/workflows/run-kata-deploy-tests-on-aks.yaml +++ b/.github/workflows/run-kata-deploy-tests-on-aks.yaml @@ -72,9 +72,6 @@ jobs: env: TARGET_BRANCH: ${{ inputs.target-branch }} - - name: Download Azure CLI - run: bash tests/functional/kata-deploy/gha-run.sh install-azure-cli - - name: Log into the Azure account uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0 with: diff --git a/tests/functional/kata-deploy/gha-run.sh b/tests/functional/kata-deploy/gha-run.sh index 83dbc3624f..ce116de111 100755 --- a/tests/functional/kata-deploy/gha-run.sh +++ b/tests/functional/kata-deploy/gha-run.sh @@ -53,7 +53,6 @@ function main() { action="${1:-}" case "${action}" in - install-azure-cli) install_azure_cli ;; create-cluster) create_cluster "kata-deploy" ;; deploy-k8s) deploy_k8s ;; install-bats) install_bats ;; diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index bb103b8eae..9dc2a93550 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -86,11 +86,6 @@ function enable_cluster_approuting() { az aks approuting enable -g "${rg}" -n "${cluster_name}" } -function install_azure_cli() { - curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash - az extension add --name aks-preview -} - function create_cluster() { test_type="${1:-k8s}" local short_sha @@ -114,6 +109,9 @@ function create_cluster() { -l eastus \ -n "${rg}" + # Required by e.g. AKS App Routing for KBS installation. + az extension add --name aks-preview + # Adding a double quote on the last line ends up causing issues # ine the cbl-mariner installation. Because of that, let's just # disable the warning for this specific case. diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 1efb75c1d6..b02ee510fd 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -566,7 +566,6 @@ function main() { action="${1:-}" case "${action}" in - install-azure-cli) install_azure_cli ;; create-cluster) create_cluster "" ;; create-cluster-kcli) create_cluster_kcli ;; configure-snapshotter) configure_snapshotter ;; diff --git a/tests/stability/gha-stability-run.sh b/tests/stability/gha-stability-run.sh index b21345c6da..8c5cfb82fd 100755 --- a/tests/stability/gha-stability-run.sh +++ b/tests/stability/gha-stability-run.sh @@ -28,7 +28,6 @@ function run_tests() { function main() { action="${1:-}" case "${action}" in - install-azure-cli) install_azure_cli ;; create-cluster) create_cluster ;; install-bats) install_bats ;; install-kata-tools) install_kata_tools ;;