From e0cced3392b16aecfef051a513dbeb04d668bda0 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 15:38:33 -0500 Subject: [PATCH 01/30] Add cron run integrations each day of the week --- .github/workflows/integration_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 3923d7f37d1..75e8e571580 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -7,6 +7,8 @@ run-name: ${{ github.actor }} Integration Testing. #What will trigger the workflow to run. on: + schedule: + - cron: '0 0 * * 1-5' workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: From 8c4ed389e6378673ca22a6d44aca825b705f032b Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 16:28:50 -0500 Subject: [PATCH 02/30] Reuse integration test workflow to setup custom slack integration --- .github/workflows/integration_tests.yml | 3 +-- .../workflows/nightly_integration_tests.yml | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/nightly_integration_tests.yml diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 75e8e571580..23b5a03b53a 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -7,8 +7,7 @@ run-name: ${{ github.actor }} Integration Testing. #What will trigger the workflow to run. on: - schedule: - - cron: '0 0 * * 1-5' + workflow_call: workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml new file mode 100644 index 00000000000..9353499d7c3 --- /dev/null +++ b/.github/workflows/nightly_integration_tests.yml @@ -0,0 +1,27 @@ +name: 'Nightly Integration Tests' + +#This github action runs all of Cromwell's integration tests nightly. + +#This is what shows up in the github workflows page as the title. +run-name: Nightly ${{ github.actor }} Integration Testing. + +#What will trigger the workflow to run. +on: + schedule: + - cron: '0 0 * * 1-5' + +permissions: + contents: read + +jobs: + integration-tests: + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml + +steps: + - uses: ravsamhq/notify-slack-action@v2 + if: always() + with: + status: ${{ job.status }} + notify_when: "failure" + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From fd10d3a5b5474c39ff9d101cca6ea887bafc2068 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 17:01:03 -0500 Subject: [PATCH 03/30] Update for branch argument --- .github/workflows/integration_tests.yml | 8 +++++++ .../workflows/nightly_integration_tests.yml | 21 +++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 23b5a03b53a..348f60415f7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -5,6 +5,12 @@ name: 'Integration Tests' #This is what shows up in the github workflows page as the title. run-name: ${{ github.actor }} Integration Testing. +#Inputs parameters for this workflow +inputs: + target-branch: + description: 'The branch to run integration tests against' + required: 'false' + #What will trigger the workflow to run. on: workflow_call: @@ -77,6 +83,8 @@ jobs: timeout-minutes: 120 steps: - uses: actions/checkout@v3 # checkout the cromwell repo + with: + ref: ${{target-branch}} - uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt. with: cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 9353499d7c3..a4a2b55df8e 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -7,6 +7,7 @@ run-name: Nightly ${{ github.actor }} Integration Testing. #What will trigger the workflow to run. on: + workflow_dispatch: schedule: - cron: '0 0 * * 1-5' @@ -15,13 +16,15 @@ permissions: jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml + steps: + - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml + with: + target-branch: 'develop' + - uses: ravsamhq/notify-slack-action@v2 + if: always() + with: + status: ${{ job.status }} + notify_when: "failure" + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} -steps: - - uses: ravsamhq/notify-slack-action@v2 - if: always() - with: - status: ${{ job.status }} - notify_when: "failure" - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From 008ca09873c4f4d027013f4feecd9122242e62bc Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 17:21:09 -0500 Subject: [PATCH 04/30] Checkout repo for action --- .github/workflows/nightly_integration_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index a4a2b55df8e..33c6752f61d 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,6 +17,7 @@ permissions: jobs: integration-tests: steps: + - uses: actions/checkout@v3 - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml with: target-branch: 'develop' From de088011c1acd6928bdcab92198ac48baa6b1998 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 17:38:47 -0500 Subject: [PATCH 05/30] Fix reused workflow --- .github/workflows/nightly_integration_tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 33c6752f61d..61a01c2a87d 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -16,11 +16,10 @@ permissions: jobs: integration-tests: - steps: - - uses: actions/checkout@v3 - - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 with: target-branch: 'develop' + steps: - uses: ravsamhq/notify-slack-action@v2 if: always() with: From a0dc1ad62e6cbdebb61f9c53e2e956b84a001150 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 17:40:13 -0500 Subject: [PATCH 06/30] Fix whitespace --- .github/workflows/nightly_integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 61a01c2a87d..965811624f2 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,8 +17,8 @@ permissions: jobs: integration-tests: uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 - with: - target-branch: 'develop' + with: + target-branch: 'develop' steps: - uses: ravsamhq/notify-slack-action@v2 if: always() From b5da7bb5eaafb481fa86030e3b03a517dc3e54d0 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Fri, 10 Mar 2023 17:41:28 -0500 Subject: [PATCH 07/30] Merge steps for job --- .github/workflows/nightly_integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 965811624f2..569135deec6 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -16,10 +16,10 @@ permissions: jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 - with: - target-branch: 'develop' steps: + - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 + with: + target-branch: 'develop' - uses: ravsamhq/notify-slack-action@v2 if: always() with: From 00b95e51be244b2f1983f440e552cc1cf2abec1c Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:19:23 -0400 Subject: [PATCH 08/30] Use conditional logic to enable slack alerts --- .github/workflows/integration_tests.yml | 12 ++++++++++++ .github/workflows/nightly_integration_tests.yml | 10 ++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 348f60415f7..a8d4e37d699 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -10,6 +10,10 @@ inputs: target-branch: description: 'The branch to run integration tests against' required: 'false' + slack-alert: + description: 'A flag to enable slack alerts. True if this should alert via slack' + required: 'true' + default: 'false' #What will trigger the workflow to run. on: @@ -96,6 +100,14 @@ jobs: set -e echo Running test.sh ./src/ci/bin/test.sh + - uses: ravsamhq/notify-slack-action@v2 + if: ${{ slack-alert }} + with: + status: ${{ job.status }} + notify_when: "failure" + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + #The "shell: ..."" line is a way to force the Github Action Runner to use a bash shell that thinks it has a TTY. #The issue and solution are described here: https://github.com/actions/runner/issues/241#issuecomment-842566950 #This is only needed for ReferenceDiskManifestBuilderApp test. diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 569135deec6..68ef51ffd23 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -14,17 +14,11 @@ on: permissions: contents: read +# Use if as arg to only send slack notifications on nightly jobs: integration-tests: steps: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 with: target-branch: 'develop' - - uses: ravsamhq/notify-slack-action@v2 - if: always() - with: - status: ${{ job.status }} - notify_when: "failure" - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - + slack-alert: 'true' From 7a3ce3b26f93fa1c7d8b6a9d62402c6e8dc29e47 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:21:04 -0400 Subject: [PATCH 09/30] Fix sub workflow so it is not a step --- .github/workflows/nightly_integration_tests.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 68ef51ffd23..9e45d3718f3 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,8 +17,7 @@ permissions: # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - steps: - - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 - with: - target-branch: 'develop' - slack-alert: 'true' + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 + with: + target-branch: 'develop' + slack-alert: 'true' From 2649e68a30d14c87f94a0c0179defe5ccf34c1d0 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:24:27 -0400 Subject: [PATCH 10/30] Fix types --- .github/workflows/integration_tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index a8d4e37d699..02f22806162 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -8,9 +8,11 @@ run-name: ${{ github.actor }} Integration Testing. #Inputs parameters for this workflow inputs: target-branch: + type: 'string' description: 'The branch to run integration tests against' required: 'false' - slack-alert: + slack-alert: + type: 'boolean' description: 'A flag to enable slack alerts. True if this should alert via slack' required: 'true' default: 'false' @@ -88,7 +90,7 @@ jobs: steps: - uses: actions/checkout@v3 # checkout the cromwell repo with: - ref: ${{target-branch}} + ref: ${{ target-branch }} - uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt. with: cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} From 8df4ddc3d28cbf69d0f6a54c4a298cefda781963 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:27:13 -0400 Subject: [PATCH 11/30] Move inputs --- .github/workflows/integration_tests.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 02f22806162..10b8899c534 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -6,20 +6,20 @@ name: 'Integration Tests' run-name: ${{ github.actor }} Integration Testing. #Inputs parameters for this workflow -inputs: - target-branch: - type: 'string' - description: 'The branch to run integration tests against' - required: 'false' - slack-alert: - type: 'boolean' - description: 'A flag to enable slack alerts. True if this should alert via slack' - required: 'true' - default: 'false' #What will trigger the workflow to run. on: workflow_call: + inputs: + target-branch: + type: 'string' + description: 'The branch to run integration tests against' + required: 'false' + slack-alert: + type: 'boolean' + description: 'A flag to enable slack alerts. True if this should alert via slack' + required: 'true' + default: 'false' workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: From e0c7072813d2bdad0a6bf8767e97eb8c1391d398 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:36:18 -0400 Subject: [PATCH 12/30] Change type of inputs --- .github/workflows/integration_tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 10b8899c534..2af9d3ae178 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -12,14 +12,15 @@ on: workflow_call: inputs: target-branch: - type: 'string' + type: string description: 'The branch to run integration tests against' required: 'false' slack-alert: - type: 'boolean' + type: boolean description: 'A flag to enable slack alerts. True if this should alert via slack' required: 'true' default: 'false' + workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: From 8b6ea57f4015f82d811efdd24c4842915072fbf7 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:40:50 -0400 Subject: [PATCH 13/30] Move types --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 2af9d3ae178..0e9caea5ebb 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -12,14 +12,14 @@ on: workflow_call: inputs: target-branch: - type: string description: 'The branch to run integration tests against' required: 'false' + type: string slack-alert: - type: boolean description: 'A flag to enable slack alerts. True if this should alert via slack' required: 'true' default: 'false' + type: boolean workflow_dispatch: #Manual trigger from GitHub UI push: #git push From 7e9edf4d48d54218cb9370c315a48afbf4121bee Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 14:49:30 -0400 Subject: [PATCH 14/30] Add secrets for linter --- .github/workflows/integration_tests.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0e9caea5ebb..53608a1906d 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -20,6 +20,18 @@ on: required: 'true' default: 'false' type: boolean + secrets: + VAULT_ROLE_ID_CI: + required: 'true' + default: + VAULT_SECRET_ID_CI: + required: 'true' + BROADBOT_GITHUB_TOKEN: + required: 'true' + SLACK_WEBHOOK_URL: + required: 'false' + + workflow_dispatch: #Manual trigger from GitHub UI push: #git push From 082f3d6f8e64915454a1de6daa08c94d867d2a0b Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 15:03:08 -0400 Subject: [PATCH 15/30] Fix whitespace --- .github/workflows/integration_tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 53608a1906d..e273c2fa78c 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -23,16 +23,12 @@ on: secrets: VAULT_ROLE_ID_CI: required: 'true' - default: VAULT_SECRET_ID_CI: required: 'true' BROADBOT_GITHUB_TOKEN: required: 'true' SLACK_WEBHOOK_URL: required: 'false' - - - workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: From b03e2f6a8c7be4efcf936cc98bdba32a0f69276f Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 14 Mar 2023 17:03:45 -0400 Subject: [PATCH 16/30] Adjust whitespace --- .github/workflows/integration_tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index e273c2fa78c..ebc2ba9ab07 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -5,8 +5,6 @@ name: 'Integration Tests' #This is what shows up in the github workflows page as the title. run-name: ${{ github.actor }} Integration Testing. -#Inputs parameters for this workflow - #What will trigger the workflow to run. on: workflow_call: @@ -118,7 +116,6 @@ jobs: notify_when: "failure" env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - #The "shell: ..."" line is a way to force the Github Action Runner to use a bash shell that thinks it has a TTY. #The issue and solution are described here: https://github.com/actions/runner/issues/241#issuecomment-842566950 #This is only needed for ReferenceDiskManifestBuilderApp test. From 1cb58dd90064d5de08b67c417b070eb2455565f8 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 15 Mar 2023 14:06:35 -0400 Subject: [PATCH 17/30] Fix boolean, and if expression --- .github/workflows/integration_tests.yml | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ebc2ba9ab07..d0a9506b9c6 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -2,43 +2,43 @@ name: 'Integration Tests' #This github action runs all of Cromwell's integration tests. -#This is what shows up in the github workflows page as the title. +#This is what shows up in the github workflows page as the title. run-name: ${{ github.actor }} Integration Testing. -#What will trigger the workflow to run. +#What will trigger the workflow to run. on: workflow_call: inputs: target-branch: description: 'The branch to run integration tests against' - required: 'false' + required: false type: string slack-alert: description: 'A flag to enable slack alerts. True if this should alert via slack' - required: 'true' - default: 'false' + required: true + default: false type: boolean secrets: VAULT_ROLE_ID_CI: - required: 'true' + required: true VAULT_SECRET_ID_CI: - required: 'true' + required: true BROADBOT_GITHUB_TOKEN: - required: 'true' + required: true SLACK_WEBHOOK_URL: - required: 'false' + required: false workflow_dispatch: #Manual trigger from GitHub UI push: #git push merge_group: -permissions: +permissions: contents: read jobs: integration-tests: strategy: fail-fast: false #disabling fail-fast means that even if one test fails, the others will still try to complete. - #Each entry below is a single integration test that lives in /src/ci/bin/. + #Each entry below is a single integration test that lives in /src/ci/bin/. #Each will be launched on its own runner so they can occur in parallel. #Friendly names are displayed on the Github UI and aren't used anywhere else. matrix: @@ -96,7 +96,7 @@ jobs: timeout-minutes: 120 steps: - uses: actions/checkout@v3 # checkout the cromwell repo - with: + with: ref: ${{ target-branch }} - uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt. with: @@ -110,14 +110,14 @@ jobs: echo Running test.sh ./src/ci/bin/test.sh - uses: ravsamhq/notify-slack-action@v2 - if: ${{ slack-alert }} + if: slack-alert with: status: ${{ job.status }} notify_when: "failure" - env: + env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} #The "shell: ..."" line is a way to force the Github Action Runner to use a bash shell that thinks it has a TTY. #The issue and solution are described here: https://github.com/actions/runner/issues/241#issuecomment-842566950 - #This is only needed for ReferenceDiskManifestBuilderApp test. + #This is only needed for ReferenceDiskManifestBuilderApp test. #This test uses fancy colors in the output, which likely causes the problem. - #See WX-938. + #See WX-938. From d23a85eb8af5c81339afa60f3426f1433214a62d Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 15 Mar 2023 14:08:14 -0400 Subject: [PATCH 18/30] target branch arge adjusted --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index d0a9506b9c6..30eb1ff063e 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v3 # checkout the cromwell repo with: - ref: ${{ target-branch }} + ref: target-branch - uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt. with: cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} From 9dbe06b772036c9ae2fbb6525e38d0b27655aa04 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 15 Mar 2023 14:13:46 -0400 Subject: [PATCH 19/30] fix args --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 30eb1ff063e..aacd46ffe78 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v3 # checkout the cromwell repo with: - ref: target-branch + ref: ${{ inputs.target-branch }} - uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt. with: cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} @@ -110,7 +110,7 @@ jobs: echo Running test.sh ./src/ci/bin/test.sh - uses: ravsamhq/notify-slack-action@v2 - if: slack-alert + if: inputs.slack-alert with: status: ${{ job.status }} notify_when: "failure" From 0b024972c5c7b80b37bda48fccb61cb25dfe355d Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 15 Mar 2023 14:29:03 -0400 Subject: [PATCH 20/30] Adjust nightly workflow using linter --- .../workflows/nightly_integration_tests.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 9e45d3718f3..2dec21cfef2 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -2,22 +2,24 @@ name: 'Nightly Integration Tests' #This github action runs all of Cromwell's integration tests nightly. -#This is what shows up in the github workflows page as the title. +#This is what shows up in the github workflows page as the title. run-name: Nightly ${{ github.actor }} Integration Testing. -#What will trigger the workflow to run. +#What will trigger the workflow to run. on: workflow_dispatch: schedule: - cron: '0 0 * * 1-5' - -permissions: + +permissions: contents: read # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@fd10d3a5b5474c39ff9d101cca6ea887bafc2068 - with: - target-branch: 'develop' - slack-alert: 'true' + runs-on: ubuntu-latest + steps: + - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml + with: + target-branch: 'develop' + slack-alert: true From 60db1a555e680cd1ad0c88b68685e72c259429bd Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Wed, 15 Mar 2023 14:33:35 -0400 Subject: [PATCH 21/30] One more test of the nightly --- .github/workflows/nightly_integration_tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 2dec21cfef2..624ac40275a 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,9 +17,8 @@ permissions: # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - runs-on: ubuntu-latest - steps: - - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml - with: - target-branch: 'develop' - slack-alert: true + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@0b024972c5c7b80b37bda48fccb61cb25dfe355d + with: + target-branch: 'develop' + slack-alert: true + secrets: inherit From e6e8312507229f3e6fc135d727977bd78ed087f4 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 10:00:41 -0400 Subject: [PATCH 22/30] Move comment to try to retest --- .github/workflows/nightly_integration_tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 624ac40275a..16086a10be1 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -1,6 +1,5 @@ -name: 'Nightly Integration Tests' - #This github action runs all of Cromwell's integration tests nightly. +name: 'Nightly Integration Tests' #This is what shows up in the github workflows page as the title. run-name: Nightly ${{ github.actor }} Integration Testing. From a4bcdc7d2868809fde01a643d005a9e8d1b2a502 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 10:19:54 -0400 Subject: [PATCH 23/30] Add push trigger --- .github/workflows/nightly_integration_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 16086a10be1..c04501ebbfe 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -7,6 +7,7 @@ run-name: Nightly ${{ github.actor }} Integration Testing. #What will trigger the workflow to run. on: workflow_dispatch: + push: schedule: - cron: '0 0 * * 1-5' From a3c229401306477a9f2047cc2063efbffbfa7002 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 10:49:17 -0400 Subject: [PATCH 24/30] exit 1 --- .github/workflows/integration_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index aacd46ffe78..0b3dcb8f693 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -108,6 +108,7 @@ jobs: run: | set -e echo Running test.sh + exit 1 ./src/ci/bin/test.sh - uses: ravsamhq/notify-slack-action@v2 if: inputs.slack-alert From ef0c0c3dba9216b511a205783d35de1478d7a0b3 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 10:49:55 -0400 Subject: [PATCH 25/30] move tag --- .github/workflows/nightly_integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index c04501ebbfe..1a6ab927ebc 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,7 +17,7 @@ permissions: # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@0b024972c5c7b80b37bda48fccb61cb25dfe355d + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@a3c229401306477a9f2047cc2063efbffbfa7002 with: target-branch: 'develop' slack-alert: true From b274462d479335f6510e10bc454423739588b925 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 10:56:31 -0400 Subject: [PATCH 26/30] change boolean to string --- .github/workflows/nightly_integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 1a6ab927ebc..17aa6386be1 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -20,5 +20,5 @@ jobs: uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@a3c229401306477a9f2047cc2063efbffbfa7002 with: target-branch: 'develop' - slack-alert: true + slack-alert: 'true' secrets: inherit From 90cc46dfa1d1ed75300f0ef25607076c08151b09 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 11:03:35 -0400 Subject: [PATCH 27/30] remove exit 1 --- .github/workflows/integration_tests.yml | 3 +-- .github/workflows/nightly_integration_tests.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0b3dcb8f693..09f589779a2 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -108,13 +108,12 @@ jobs: run: | set -e echo Running test.sh - exit 1 ./src/ci/bin/test.sh - uses: ravsamhq/notify-slack-action@v2 if: inputs.slack-alert with: status: ${{ job.status }} - notify_when: "failure" + notify_when: "failure,success" env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} #The "shell: ..."" line is a way to force the Github Action Runner to use a bash shell that thinks it has a TTY. diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 17aa6386be1..1a6ab927ebc 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -20,5 +20,5 @@ jobs: uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@a3c229401306477a9f2047cc2063efbffbfa7002 with: target-branch: 'develop' - slack-alert: 'true' + slack-alert: true secrets: inherit From 9387c5bb962e1d97f457768d3d159dbd5a1731dc Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 11:04:25 -0400 Subject: [PATCH 28/30] Test slack with successes --- .github/workflows/nightly_integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 1a6ab927ebc..6ffa159f92b 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,7 +17,7 @@ permissions: # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@a3c229401306477a9f2047cc2063efbffbfa7002 + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@90cc46dfa1d1ed75300f0ef25607076c08151b09 with: target-branch: 'develop' slack-alert: true From f82e2a3811868a164c1e8a17c97ebf5c6d35f080 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 11:16:18 -0400 Subject: [PATCH 29/30] Final adjustments --- .github/workflows/integration_tests.yml | 2 +- .github/workflows/nightly_integration_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 09f589779a2..aacd46ffe78 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -113,7 +113,7 @@ jobs: if: inputs.slack-alert with: status: ${{ job.status }} - notify_when: "failure,success" + notify_when: "failure" env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} #The "shell: ..."" line is a way to force the Github Action Runner to use a bash shell that thinks it has a TTY. diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index 6ffa159f92b..b97c46ab7ab 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -17,7 +17,7 @@ permissions: # Use if as arg to only send slack notifications on nightly jobs: integration-tests: - uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@90cc46dfa1d1ed75300f0ef25607076c08151b09 + uses: broadinstitute/cromwell/.github/workflows/integration_tests.yml@develop with: target-branch: 'develop' slack-alert: true From 72df3c8d3f53cf950e7112eb90c70e157dd80e96 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Thu, 16 Mar 2023 14:36:34 -0400 Subject: [PATCH 30/30] remove push --- .github/workflows/nightly_integration_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly_integration_tests.yml b/.github/workflows/nightly_integration_tests.yml index b97c46ab7ab..024588b4ac5 100644 --- a/.github/workflows/nightly_integration_tests.yml +++ b/.github/workflows/nightly_integration_tests.yml @@ -7,7 +7,6 @@ run-name: Nightly ${{ github.actor }} Integration Testing. #What will trigger the workflow to run. on: workflow_dispatch: - push: schedule: - cron: '0 0 * * 1-5'