diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml index e687dc5056..6ae1c5b8a8 100644 --- a/.github/workflows/awstest.yml +++ b/.github/workflows/awstest.yml @@ -23,79 +23,39 @@ on: jobs: trigger-profile-test: name: Run AWS tests - if: ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.profiletest ) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - profile: test + enabled: ${{ ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.profiletest ) }} + - profile: test_full + enabled: ${{ ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.somatic ) }} + - profile: test_full_germline + enabled: ${{ ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.germline ) }} steps: # Launch workflow using Tower CLI tool action - name: Launch workflow via tower uses: seqeralabs/action-tower-launch@v2 + if: ${{ matrix.enabled }} with: workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} revision: ${{ github.sha }} - workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/sarek/work-${{ github.sha }} - parameters: | - { - "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/sarek/results-test-${{ github.sha }}" - } - profiles: test - - uses: actions/upload-artifact@v3 - with: - name: tower-profiletest-log - path: | - tower_action_*.log - tower_action_*.json - - trigger-full-test-somatic: - name: Run AWS full tests - if: ${{ ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.somatic ) }} - runs-on: ubuntu-latest - steps: - # Launch workflow using Tower CLI tool action - - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v2 - with: - workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} - access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} - compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} - revision: ${{ github.sha }} - workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/sarek/work-${{ github.sha }}/somatic_test + workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/sarek/work-${{ github.sha }}/${{ matrix.profile }} parameters: | { "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/sarek/results-${{ github.sha }}/somatic_test" + "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/sarek/results-test-${{ github.sha }}/${{ matrix.profile }}" } - profiles: test_full + profiles: ${{ matrix.profile }} - uses: actions/upload-artifact@v3 + if: ${{ matrix.enabled }} with: - name: tower-full-somatic-log + name: tower-${{ matrix.profile }}-log path: | tower_action_*.log tower_action_*.json - - trigger-full-test-germline: - name: Run AWS full tests - if: ${{ ( github.repository == 'nf-core/sarek' ) && ( github.event_name != 'workflow_dispatch' || inputs.germline ) }} - runs-on: ubuntu-latest - steps: - # Launch workflow using Tower CLI tool action - - name: Launch workflow via tower - uses: seqeralabs/action-tower-launch@v2 - with: - workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} - access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} - compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} - revision: ${{ github.sha }} - workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/sarek/work-${{ github.sha }}/germline_test - parameters: | - { - "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/sarek/results-${{ github.sha }}/germline_test" - } - profiles: test_full_germline - - uses: actions/upload-artifact@v3 - with: - name: tower-full-germline-log - path: tower_action_*.log diff --git a/CHANGELOG.md b/CHANGELOG.md index 539b938e1b..65bf5219aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ Rapaselet is a delta formed by the RapaƤtno river between the Bielloriehppe mas - [#1180](https://github.com/nf-core/sarek/pull/1180) - Updating the nf-core modules - [#1198](https://github.com/nf-core/sarek/pull/1198) - Prepare release `3.3.0` - [#1200](https://github.com/nf-core/sarek/pull/1200) - Streamline Github Actions workflows +- [#1212](https://github.com/nf-core/sarek/pull/1212) - Use matrix for AWS megatests ### Fixed