Merge pull request kata-containers#7048 from sprt/sprt/fix-gha

gha: Fix gha-run.sh and unbreak CI
microsoft · Jun 7, 2023 · 08d10d3 · 08d10d3
2 parents 452f286 + 69668ce
commit 08d10d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml
@@ -40,7 +40,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Download Azure CLI
-        run: bash tests/integration/gha-run.sh install-az-cli
+        run: bash tests/integration/gha-run.sh install-azure-cli
 
       - name: Log into the Azure account
         run: bash tests/integration/gha-run.sh login-azure

diff --git a/tests/integration/gha-run.sh b/tests/integration/gha-run.sh
@@ -100,9 +100,9 @@ function cleanup() {
     kubectl delete ${deploy_spec}
     kubectl -n kube-system wait --timeout=10m --for=delete -l name=kata-deploy pod
 
-    sed -i -e "s|quay.io/kata-containers/kata-deploy:latest|${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${DOCKER_TAG}|g" "${tools_dir}/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml"
+    sed -i -e "s|quay.io/kata-containers/kata-deploy:latest|${DOCKER_REGISTRY}/${DOCKER_REPO}:${DOCKER_TAG}|g" "${tools_dir}/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml"
     cat "${tools_dir}/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml"
-    cat "${tools_dir}/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml" | grep "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${DOCKER_TAG}" || die "Failed to setup the tests image"
+    cat "${tools_dir}/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml" | grep "${DOCKER_REGISTRY}/${DOCKER_REPO}:${DOCKER_TAG}" || die "Failed to setup the tests image"
     kubectl apply ${cleanup_spec}
     sleep 180s
 
@@ -137,7 +137,7 @@ function main() {
         cleanup-snp) cleanup "snp" ;;
         cleanup-tdx) cleanup "tdx" ;;
         delete-cluster) delete_cluster ;;
-        *) >&2 echo "Invalid action"; exit 2 ;;
+        *) >&2 echo "Invalid argument"; exit 2 ;;
     esac
 }