From f487199edff8132075cbb9d1b359880cdd0c6467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 6 Jun 2023 11:51:18 -0700 Subject: [PATCH 1/2] gha: aks: Fix argument in call to gha-run.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #7047 Signed-off-by: Aurélien Bombo --- .github/workflows/run-k8s-tests-on-aks.yaml | 2 +- tests/integration/gha-run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index e9f7b55b1..a39c2bbcd 100644 --- 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 index 6238141dd..7544c1518 100755 --- a/tests/integration/gha-run.sh +++ b/tests/integration/gha-run.sh @@ -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 } From 69668ce87f09201716ad0d42f6ad2614432008cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 6 Jun 2023 11:54:43 -0700 Subject: [PATCH 2/2] tests: gha-run: Use correct env variable for repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s/DOCKER_IMAGE/DOCKER_REPO Signed-off-by: Aurélien Bombo --- tests/integration/gha-run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/gha-run.sh b/tests/integration/gha-run.sh index 7544c1518..103ce2cda 100755 --- 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