diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 285e2ecc5c..72f516343d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -176,6 +176,7 @@ jobs: needs: [publish-kata-deploy-payload-amd64, build-and-publish-tee-confidential-unencrypted-image] uses: ./.github/workflows/run-kata-coco-tests.yaml with: + tarball-suffix: -${{ inputs.tag }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci tag: ${{ inputs.tag }}-amd64 diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index e76584a1af..2710641ed7 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -2,6 +2,9 @@ name: CI | Run kata coco tests on: workflow_call: inputs: + tarball-suffix: + required: false + type: string registry: required: true type: string @@ -262,6 +265,7 @@ jobs: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} SNAPSHOTTER: ${{ matrix.snapshotter }} USING_NFD: "false" + AUTO_GENERATE_POLICY: "yes" steps: - uses: actions/checkout@v4 with: @@ -274,6 +278,15 @@ jobs: env: TARGET_BRANCH: ${{ inputs.target-branch }} + - name: get-kata-tarball + uses: actions/download-artifact@v4 + with: + name: kata-static-tarball-amd64${{ inputs.tarball-suffix }} + path: kata-artifacts + + - 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 @@ -315,7 +328,7 @@ jobs: run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client - name: Run tests - timeout-minutes: 60 + timeout-minutes: 80 run: bash tests/integration/kubernetes/gha-run.sh run-tests - name: Delete AKS cluster diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 4a0a69552b..6653322ccc 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -84,7 +84,7 @@ auto_generate_policy_enabled() { adapt_common_policy_settings_for_tdx() { local settings_dir=$1 - info "Adapting common policy settings for TDX or SNP" + info "Adapting common policy settings for TDX, SNP, or the non-TEE development environment" jq '.common.cpath = "/run/kata-containers" | .volumes.configMap.mount_point = "^$(cpath)/$(bundle-id)-[a-z0-9]{16}-"' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json" } @@ -119,7 +119,7 @@ adapt_common_policy_settings() { local settings_dir=$1 case "${KATA_HYPERVISOR}" in - "qemu-tdx"|"qemu-snp") + "qemu-tdx"|"qemu-snp"|"qemu-coco-dev") adapt_common_policy_settings_for_tdx "${settings_dir}" ;; "qemu-sev")