From 61726a799ba91ee29e6ca945ccad9de620b98ec1 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 14 Mar 2024 14:14:55 +0200 Subject: [PATCH 1/2] ci: fix enclave-cc nightly tests enclave-cc nightly tests have been failing since the latest payload images moved to a different Occlum instance path. Since the same pod .yaml is used for both v0.8.0 based payload and "latest" payload, just patch the path for the nightly tests until a new release payload is available. Signed-off-by: Mikko Ylinen --- .github/workflows/enclave-cc-cicd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/enclave-cc-cicd.yaml b/.github/workflows/enclave-cc-cicd.yaml index 0c334292..eb951aa5 100644 --- a/.github/workflows/enclave-cc-cicd.yaml +++ b/.github/workflows/enclave-cc-cicd.yaml @@ -55,5 +55,6 @@ jobs: - name: Deploy sample workload run: | + sed -i -e 's:boot_instance:occlum_instance:' tests/e2e/enclave-cc-pod-sim.yaml kubectl apply -f tests/e2e/enclave-cc-pod-sim.yaml kubectl wait --for=condition=Ready pod/enclave-cc-pod-sim From d52e0504e3bd86399ab10a6bdf6802f76093927c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 14 Mar 2024 14:15:26 +0200 Subject: [PATCH 2/2] ci: update to k8s 1.29.x for enclave-cc tests Signed-off-by: Mikko Ylinen --- .github/workflows/enclave-cc-cicd.yaml | 2 +- .github/workflows/enclave-cc-e2e.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/enclave-cc-cicd.yaml b/.github/workflows/enclave-cc-cicd.yaml index eb951aa5..2b91b5b5 100644 --- a/.github/workflows/enclave-cc-cicd.yaml +++ b/.github/workflows/enclave-cc-cicd.yaml @@ -32,7 +32,7 @@ jobs: - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.27.3" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.29.2" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= - name: Deploy operator from the local registry diff --git a/.github/workflows/enclave-cc-e2e.yaml b/.github/workflows/enclave-cc-e2e.yaml index 33f1170d..777c326f 100644 --- a/.github/workflows/enclave-cc-e2e.yaml +++ b/.github/workflows/enclave-cc-e2e.yaml @@ -42,7 +42,7 @@ jobs: - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.27.3" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.29.2" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= docker network connect kind registry