From 88eaff5330c4bf8f79ed04704e5c691cd54ec0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 18 Jul 2023 15:39:52 +0200 Subject: [PATCH 1/2] ci: tdx: Adjust KUBECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't need to export KUBECONFIG there. Let's just make sure we have the server correctly setup and avoid doing that. Signed-off-by: Fabiano Fidêncio --- .github/workflows/run-k8s-tests-on-tdx.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-k8s-tests-on-tdx.yaml b/.github/workflows/run-k8s-tests-on-tdx.yaml index ccbc16db79..7e90ad3aa6 100644 --- a/.github/workflows/run-k8s-tests-on-tdx.yaml +++ b/.github/workflows/run-k8s-tests-on-tdx.yaml @@ -28,7 +28,6 @@ jobs: DOCKER_REPO: ${{ inputs.repo }} DOCKER_TAG: ${{ inputs.tag }} KATA_HYPERVISOR: ${{ matrix.vmm }} - KUBECONFIG: /etc/rancher/k3s/k3s.yaml steps: - uses: actions/checkout@v3 with: From 2ee2cd307b001f8eab4d8192271cf0e3fec4c595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 18 Jul 2023 15:41:47 +0200 Subject: [PATCH 2/2] ci: k8s: Move gha-run.sh to the kubernetes dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The file belongs there, as it's only used for k8s related tests. Fixes: #7373 Signed-off-by: Fabiano Fidêncio --- .github/workflows/run-k8s-tests-on-aks.yaml | 16 ++++++++-------- .github/workflows/run-k8s-tests-on-sev.yaml | 4 ++-- .github/workflows/run-k8s-tests-on-snp.yaml | 4 ++-- .github/workflows/run-k8s-tests-on-tdx.yaml | 4 ++-- tests/integration/{ => kubernetes}/gha-run.sh | 0 5 files changed, 14 insertions(+), 14 deletions(-) rename tests/integration/{ => kubernetes}/gha-run.sh (100%) diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index d8658270a8..6b3b16aeba 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -46,31 +46,31 @@ jobs: ref: ${{ inputs.commit-hash }} - name: Download Azure CLI - run: bash tests/integration/gha-run.sh install-azure-cli + run: bash tests/integration/kubernetes/gha-run.sh install-azure-cli - name: Log into the Azure account - run: bash tests/integration/gha-run.sh login-azure + run: bash tests/integration/kubernetes/gha-run.sh login-azure env: AZ_APPID: ${{ secrets.AZ_APPID }} AZ_PASSWORD: ${{ secrets.AZ_PASSWORD }} AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - name: Create AKS cluster - run: bash tests/integration/gha-run.sh create-cluster + run: bash tests/integration/kubernetes/gha-run.sh create-cluster - name: Install `bats` - run: bash tests/integration/gha-run.sh install-bats + run: bash tests/integration/kubernetes/gha-run.sh install-bats - name: Install `kubectl` - run: bash tests/integration/gha-run.sh install-kubectl + run: bash tests/integration/kubernetes/gha-run.sh install-kubectl - name: Download credentials for the Kubernetes CLI to use them - run: bash tests/integration/gha-run.sh get-cluster-credentials + run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials - name: Run tests timeout-minutes: 60 - run: bash tests/integration/gha-run.sh run-tests-aks + run: bash tests/integration/kubernetes/gha-run.sh run-tests-aks - name: Delete AKS cluster if: always() - run: bash tests/integration/gha-run.sh delete-cluster + run: bash tests/integration/kubernetes/gha-run.sh delete-cluster diff --git a/.github/workflows/run-k8s-tests-on-sev.yaml b/.github/workflows/run-k8s-tests-on-sev.yaml index 3fc4ca835d..3b43751bc9 100644 --- a/.github/workflows/run-k8s-tests-on-sev.yaml +++ b/.github/workflows/run-k8s-tests-on-sev.yaml @@ -36,8 +36,8 @@ jobs: - name: Run tests timeout-minutes: 30 - run: bash tests/integration/gha-run.sh run-tests-sev + run: bash tests/integration/kubernetes/gha-run.sh run-tests-sev - name: Delete kata-deploy if: always() - run: bash tests/integration/gha-run.sh cleanup-sev + run: bash tests/integration/kubernetes/gha-run.sh cleanup-sev diff --git a/.github/workflows/run-k8s-tests-on-snp.yaml b/.github/workflows/run-k8s-tests-on-snp.yaml index 8aa1763d20..49c55fb36d 100644 --- a/.github/workflows/run-k8s-tests-on-snp.yaml +++ b/.github/workflows/run-k8s-tests-on-snp.yaml @@ -36,8 +36,8 @@ jobs: - name: Run tests timeout-minutes: 30 - run: bash tests/integration/gha-run.sh run-tests-snp + run: bash tests/integration/kubernetes/gha-run.sh run-tests-snp - name: Delete kata-deploy if: always() - run: bash tests/integration/gha-run.sh cleanup-snp + run: bash tests/integration/kubernetes/gha-run.sh cleanup-snp diff --git a/.github/workflows/run-k8s-tests-on-tdx.yaml b/.github/workflows/run-k8s-tests-on-tdx.yaml index 7e90ad3aa6..791d7cba84 100644 --- a/.github/workflows/run-k8s-tests-on-tdx.yaml +++ b/.github/workflows/run-k8s-tests-on-tdx.yaml @@ -35,8 +35,8 @@ jobs: - name: Run tests timeout-minutes: 30 - run: bash tests/integration/gha-run.sh run-tests-tdx + run: bash tests/integration/kubernetes/gha-run.sh run-tests-tdx - name: Delete kata-deploy if: always() - run: bash tests/integration/gha-run.sh cleanup-tdx + run: bash tests/integration/kubernetes/gha-run.sh cleanup-tdx diff --git a/tests/integration/gha-run.sh b/tests/integration/kubernetes/gha-run.sh similarity index 100% rename from tests/integration/gha-run.sh rename to tests/integration/kubernetes/gha-run.sh