diff --git a/.github/actions/provision-cluster/action.yml b/.github/actions/provision-cluster/action.yml index a11af0f7339..b3ba0835b70 100644 --- a/.github/actions/provision-cluster/action.yml +++ b/.github/actions/provision-cluster/action.yml @@ -4,20 +4,28 @@ inputs: condition: description: Condition this should run on required: true + ref: + description: Ref for code checkout + default: "${{ github.event.pull_request.head.sha }}" + required: false runs: using: "composite" steps: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.head.sha }} + ref: ${{ inputs.ref }} - name: Request and Provision a Cluster if: ${{ inputs.condition }} shell: bash run: | . ci/gha_functions.sh STAGE_NAME='${{ env.STAGE_NAME }}' - REQID='${{ github.event.pull_request.number }}-${{ github.run_number }}' + if "${{ github.event.schedule }}"; then + REQID='${{ github.run_id }}-${{ github.run_number }}' + else + REQID='${{ github.event.pull_request.number }}-${{ github.run_number }}' + fi CP_PRIORITY=${{ env.CP_PRIORITY }} if ! JENKINS_URL='${{ env.JENKINS_URL }}' \ LABEL='${{ env.LABEL }}' \ diff --git a/.github/workflows/gcp-weekly.yml b/.github/workflows/gcp-weekly.yml index 44a83bf34ea..7a6bfd85220 100644 --- a/.github/workflows/gcp-weekly.yml +++ b/.github/workflows/gcp-weekly.yml @@ -310,6 +310,11 @@ jobs: - name: Request and Provision a Cluster timeout-minutes: 7200 uses: ./.github/actions/provision-cluster + with: + condition: true + # DO NOT LAND THIS. This is for testing only + ref: ${{ github.event.pull_request.head.sha }} + # ref: ${{ env.GCP_BRANCH }} - name: Run Test timeout-minutes: 7200 id: run-test @@ -467,6 +472,11 @@ jobs: - name: Request and Provision a Cluster timeout-minutes: 7200 uses: ./.github/actions/provision-cluster + with: + condition: true + # DO NOT LAND THIS. This is for testing only + ref: ${{ github.event.pull_request.head.sha }} + # ref: ${{ env.GCP_BRANCH }} - name: Run Test timeout-minutes: 7200 id: run-test @@ -544,8 +554,8 @@ jobs: --build-arg DAOS_JAVA_BUILD=yes --tag gha-amd-${{github.run_id}}-${{github.run_attempt}} - name: Run Unit Testing with bdev - run: docker run gha-amd-${{github.run_id}}-${{github.run_attempt}} + run: docker run --privileged=true gha-amd-${{github.run_id}}-${{github.run_attempt}} cd daos && BDEV_TEST=true ./ci/unit/test_main_node.sh - name: Run Unit Testing with bdev and memcheck - run: docker run gha-amd-${{github.run_id}}-${{github.run_attempt}} + run: docker run --privileged=true gha-amd-${{github.run_id}}-${{github.run_attempt}} cd daos && WITH_VALGRIND=true BDEV_TEST=true ./ci/unit/test_main_node.sh