From 4c4a6cdab0908a535440645f959989775ea5de89 Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Thu, 14 Mar 2024 13:52:59 +0000 Subject: [PATCH 1/2] gha: fix azure integration tests --- .github/workflows/azure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/azure.yml b/.github/workflows/azure.yml index 7f8b059ca..1f234d395 100644 --- a/.github/workflows/azure.yml +++ b/.github/workflows/azure.yml @@ -52,14 +52,14 @@ jobs: - name: "Start a managed k8s cluster on Azure's Kubernetes Service" run: | [[ "${{ matrix.wasm_vm }}" == "sgx" ]] && SUFFIX_SGX="True" || SUFFIX_SGX="False" - ./bin/inv_wrapper.sh cluster.provision --name ${{ env.CLUSTER_NAME }} --vm Standard_DC4s_v3 --nodes 4 --location eastus2 --sgx ${SUFFIX_SGX} + ./bin/inv_wrapper.sh cluster.provision --name ${{ env.CLUSTER_NAME }} --vm Standard_DC4s_v3 --nodes 2 --location eastus2 --sgx ${SUFFIX_SGX} ./bin/inv_wrapper.sh cluster.credentials --name ${{ env.CLUSTER_NAME }} working-directory: ${{ github.workspace }}/experiment-base - name: "Install faasmctl" run: source ./bin/workon.sh && pip3 install faasmctl==0.34.0 working-directory: ${{ github.workspace }}/experiment-base - name: "Deploy Faasm on k8s cluster" - run: source ./bin/workon.sh && faasmctl deploy.k8s --workers=4 + run: source ./bin/workon.sh && faasmctl deploy.k8s --workers=1 working-directory: ${{ github.workspace }}/experiment-base - name: "Build, upload and run a simple CPP function" run: source ./bin/workon.sh && faasmctl cli.cpp --cmd "./bin/inv_wrapper.sh func demo hello func.upload demo hello func.invoke demo hello" From d51dc939fafcd5712887cb5ede3528742820639e Mon Sep 17 00:00:00 2001 From: Carlos Segarra Date: Thu, 14 Mar 2024 13:55:06 +0000 Subject: [PATCH 2/2] gha: add timeout to tests --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2d928810d..145df36b1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -259,6 +259,9 @@ jobs: (needs.cpp-funcs.result == 'success' || needs.cpp-funcs.result == 'skipped') && (needs.py-funcs.result == 'success' || needs.py-funcs.result == 'skipped') runs-on: ubuntu-latest + # This timeout should be long enough to let slow tests (w/ sanitisers) + # build and run, but still kill the GHA if something goes wrong + timeout-minutes: 40 strategy: fail-fast: false matrix: @@ -391,6 +394,9 @@ jobs: (needs.cpp-funcs.result == 'success' || needs.cpp-funcs.result == 'skipped') && (needs.py-funcs.result == 'success' || needs.py-funcs.result == 'skipped') runs-on: self-hosted + # This timeout should be long enough to let slow tests (w/ SGX) + # build and run, but still kill the GHA if something goes wrong + timeout-minutes: 40 env: HOST_TYPE: ci IS_SGX_CI: true