From 96499480e6e5c926fa159b0cfdab41b6bc97baa4 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 30 Aug 2023 19:35:48 +0200 Subject: [PATCH 1/2] .github/workflows/build-pr.yml: Remove expensive_checks setting for compilation test The expensive flag does not apply to the compilation test jobs. Missed in the review of 8f525698 (CI: add job test for PR CI, 2023-04-22). --- .github/workflows/build-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7bdd96e505..d235eac84e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -105,7 +105,6 @@ jobs: installer_artifact_name: BuildInstaller-dev-assets installer_flags: ${{ fromJSON('["-x skipHardwareXOPs",""]')[matrix.hardware] }} -s ${{ matrix.source }} artifact_name: CompilationTest-${{ matrix.source }}-${{ fromJSON('["no-hardware","hardware"]')[matrix.hardware] }}-assets - expensive_checks: "1" Documentation: name: ๐Ÿ‘ท Documentation From f4340ba98cb798103f88dba8eb93239699804953 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 30 Aug 2023 19:43:13 +0200 Subject: [PATCH 2/2] .github/workflows: Add timeout_minutes parameter for IP reusable workflowe It sometimes happens that the IP tests don't finish due to a dialog popping up. As the default timeout is 360 minutes (6h) this means we have to wait for quite some time for the job to finish. Let's be a bit quicker. The times are rounded up from [1]. [1]: https://github.com/AllenInstitute/MIES/actions/runs/5975280510 --- .github/workflows/build-pr.yml | 4 ++++ .github/workflows/test-igor-workflow.yml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index d235eac84e..2745ca90b6 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -105,6 +105,7 @@ jobs: installer_artifact_name: BuildInstaller-dev-assets installer_flags: ${{ fromJSON('["-x skipHardwareXOPs",""]')[matrix.hardware] }} -s ${{ matrix.source }} artifact_name: CompilationTest-${{ matrix.source }}-${{ fromJSON('["no-hardware","hardware"]')[matrix.hardware] }}-assets + timeout_minutes: 60 Documentation: name: ๐Ÿ‘ท Documentation @@ -150,6 +151,7 @@ jobs: artifact_name: test-without-hw-assets expensive_checks: "1" instrument_tests: ${{ fromJson('["0", "1"]')[inputs.do_instrumentation] }} + timeout_minutes: 60 TestNI: name: ๐Ÿงช Test NI ${{ matrix.name }} @@ -172,6 +174,7 @@ jobs: artifact_name: test-ni-assets expensive_checks: "1" instrument_tests: ${{ fromJson('["0", "1"]')[inputs.do_instrumentation] }} + timeout_minutes: 180 TestITC: name: ๐Ÿงช Test ITC ${{ matrix.name }} @@ -194,6 +197,7 @@ jobs: artifact_name: test-itc-assets expensive_checks: "1" instrument_tests: ${{ fromJson('["0", "1"]')[inputs.do_instrumentation] }} + timeout_minutes: 180 ValidateNwb: name: ๐Ÿ‘ฎ๐Ÿผ Validate NWBv2 diff --git a/.github/workflows/test-igor-workflow.yml b/.github/workflows/test-igor-workflow.yml index 0d519e0c83..a74fb99781 100644 --- a/.github/workflows/test-igor-workflow.yml +++ b/.github/workflows/test-igor-workflow.yml @@ -51,6 +51,11 @@ on: default: "0" type: string description: Sets environment variable CI_INSTRUMENT_TESTS + timeout_minutes: + required: false + default: 360 + type: number + description: Defines the job timeout in minutes defaults: run: shell: bash @@ -59,6 +64,7 @@ jobs: Test: name: ${{ inputs.overwrite_job_name && inputs.job_name || 'Run' }} runs-on: ${{ fromJson(inputs.target) }} + timeout-minutes: ${{ inputs.timeout_minutes }} env: CI_EXPENSIVE_CHECKS: ${{ inputs.expensive_checks }} CI_INSTRUMENT_TESTS: ${{ inputs.instrument_tests }}