Merge pull request #7374 from fidencio/topic/ci-tdx-adjust-kubeconfig-path

ci: Move `tests/integration/gha-run.sh`  to `tests/integration/kuberentes/` ... and also remove KUBECONFIG from the tdx envs
This commit is contained in:
Fabiano Fidêncio 2023-07-18 17:32:57 +02:00 committed by GitHub
commit 2011e3d72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 15 deletions

View File

@ -46,31 +46,31 @@ jobs:
ref: ${{ inputs.commit-hash }} ref: ${{ inputs.commit-hash }}
- name: Download Azure CLI - 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 - 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: env:
AZ_APPID: ${{ secrets.AZ_APPID }} AZ_APPID: ${{ secrets.AZ_APPID }}
AZ_PASSWORD: ${{ secrets.AZ_PASSWORD }} AZ_PASSWORD: ${{ secrets.AZ_PASSWORD }}
AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }}
- name: Create AKS cluster - 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` - 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` - 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 - 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 - name: Run tests
timeout-minutes: 60 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 - name: Delete AKS cluster
if: always() if: always()
run: bash tests/integration/gha-run.sh delete-cluster run: bash tests/integration/kubernetes/gha-run.sh delete-cluster

View File

@ -36,8 +36,8 @@ jobs:
- name: Run tests - name: Run tests
timeout-minutes: 30 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 - name: Delete kata-deploy
if: always() if: always()
run: bash tests/integration/gha-run.sh cleanup-sev run: bash tests/integration/kubernetes/gha-run.sh cleanup-sev

View File

@ -36,8 +36,8 @@ jobs:
- name: Run tests - name: Run tests
timeout-minutes: 30 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 - name: Delete kata-deploy
if: always() if: always()
run: bash tests/integration/gha-run.sh cleanup-snp run: bash tests/integration/kubernetes/gha-run.sh cleanup-snp

View File

@ -28,7 +28,6 @@ jobs:
DOCKER_REPO: ${{ inputs.repo }} DOCKER_REPO: ${{ inputs.repo }}
DOCKER_TAG: ${{ inputs.tag }} DOCKER_TAG: ${{ inputs.tag }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBECONFIG: /etc/rancher/k3s/k3s.yaml
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -36,8 +35,8 @@ jobs:
- name: Run tests - name: Run tests
timeout-minutes: 30 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 - name: Delete kata-deploy
if: always() if: always()
run: bash tests/integration/gha-run.sh cleanup-tdx run: bash tests/integration/kubernetes/gha-run.sh cleanup-tdx