From 3edfc9c541a8168a094b23c58d85f6d5b6c7589a Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Mon, 4 Sep 2023 17:35:40 +0800 Subject: [PATCH] [ci] Add extra container run parameters support for hw ci --- .github/workflows/composite_action/hw/action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composite_action/hw/action.yml b/.github/workflows/composite_action/hw/action.yml index e3f8b20f..8e8b5c42 100644 --- a/.github/workflows/composite_action/hw/action.yml +++ b/.github/workflows/composite_action/hw/action.yml @@ -12,6 +12,10 @@ inputs: description: 'Occlum docker image base OS' required: false default: 'ubuntu20.04' + container-run-params: + description: 'Extra container run parameters' + required: false + default: '' runs: using: "composite" @@ -36,9 +40,9 @@ runs: - name: Create container run: | if [[ "${{ matrix.self_runner[1] }}" == "SGX1-HW" ]]; then - docker run -itd --name=${{ env.CONTAINER_NAME }} --privileged --rm --env CARGO_HTTP_MULTIPLEXING=false --device /dev/isgx -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-${{ inputs.os }}; + docker run -itd --name=${{ env.CONTAINER_NAME }} ${{ inputs.container-run-params }} --privileged --rm --env CARGO_HTTP_MULTIPLEXING=false --device /dev/isgx -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-${{ inputs.os }}; elif [[ "${{ matrix.self_runner[1] }}" == "SGX2-HW" ]]; then - docker run -itd --name=${{ env.CONTAINER_NAME }} --privileged --rm --env CARGO_HTTP_MULTIPLEXING=false -v /dev/sgx:/dev/sgx -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-${{ inputs.os }}; + docker run -itd --name=${{ env.CONTAINER_NAME }} ${{ inputs.container-run-params }} --privileged --rm --env CARGO_HTTP_MULTIPLEXING=false -v /dev/sgx:/dev/sgx -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-${{ inputs.os }}; else echo "Unsupported Hardware" fi;