From 1a8e68293c75f79c7b322b4a78b541d191df53b3 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 22 Feb 2024 11:40:56 +0000 Subject: [PATCH 1/3] Update Github Action to run full-sized test for all 3 download methods --- .github/workflows/cloud_tests_full.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cloud_tests_full.yml b/.github/workflows/cloud_tests_full.yml index 2748b542..7b049497 100644 --- a/.github/workflows/cloud_tests_full.yml +++ b/.github/workflows/cloud_tests_full.yml @@ -19,6 +19,9 @@ jobs: run-full-tests-on-aws: if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' || !github.event.inputs }} runs-on: ubuntu-latest + strategy: + matrix: + download_method: ["aspera", "ftp", "sratools"] steps: - uses: seqeralabs/action-tower-launch@v2 with: @@ -26,13 +29,14 @@ jobs: access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_CE_AWS_CPU }} workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/fetchngs/work-${{ github.sha }}" - run_name: "aws_fetchngs_full" + run_name: "aws_fetchngs_full_${{ matrix.download_method }}" revision: ${{ github.sha }} profiles: test_full parameters: | { "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "${{ secrets.TOWER_BUCKET_AWS }}/fetchngs/results-${{ github.sha }}/" + "download_method": "${{ matrix.download_method }}", + "outdir": "${{ secrets.TOWER_BUCKET_AWS }}/fetchngs/results-${{ github.sha }}/download_method_${{ matrix.download_method }}/" } - uses: actions/upload-artifact@v3 with: @@ -42,6 +46,9 @@ jobs: run-full-tests-on-azure: if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'azure' || !github.event.inputs }} runs-on: ubuntu-latest + strategy: + matrix: + download_method: ["aspera", "ftp", "sratools"] steps: - uses: seqeralabs/action-tower-launch@v2 with: @@ -49,13 +56,14 @@ jobs: access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_CE_AZURE_CPU }} workdir: "${{ secrets.TOWER_BUCKET_AZURE }}/work/fetchngs/work-${{ github.sha }}" - run_name: "azure_fetchngs_full" + run_name: "azure_fetchngs_full_${{ matrix.download_method }}" revision: ${{ github.sha }} profiles: test_full parameters: | { "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "${{ secrets.TOWER_BUCKET_AZURE }}/fetchngs/results-${{ github.sha }}/" + "download_method": "${{ matrix.download_method }}", + "outdir": "${{ secrets.TOWER_BUCKET_AZURE }}/fetchngs/results-${{ github.sha }}/download_method_${{ matrix.download_method }}/" } - uses: actions/upload-artifact@v3 with: @@ -65,6 +73,8 @@ jobs: run-full-tests-on-gcp: if: ${{ github.event.inputs.platform == 'gcp' || !github.event.inputs }} runs-on: ubuntu-latest + matrix: + download_method: ["aspera", "ftp", "sratools"] steps: - uses: seqeralabs/action-tower-launch@v2 with: @@ -72,13 +82,14 @@ jobs: access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} compute_env: ${{ secrets.TOWER_CE_GCP_CPU }} workdir: "${{ secrets.TOWER_BUCKET_GCP }}/work/fetchngs/work-${{ github.sha }}" - run_name: "gcp_fetchngs_full" + run_name: "gcp_fetchngs_full_${{ matrix.download_method }}" revision: ${{ github.sha }} profiles: test_full parameters: | { "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}", - "outdir": "${{ secrets.TOWER_BUCKET_GCP }}/fetchngs/results-${{ github.sha }}/" + "download_method": "${{ matrix.download_method }}", + "outdir": "${{ secrets.TOWER_BUCKET_GCP }}/fetchngs/results-${{ github.sha }}/download_method_${{ matrix.download_method }}/" } - uses: actions/upload-artifact@v3 with: From 430c520267cc80ea0b24c9e84f626d4de55ec662 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 22 Feb 2024 11:42:54 +0000 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b239b8..20aa37c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements - [PR #268](https://github.com/nf-core/fetchngs/pull/268) - Add mermaid diagram - [PR #273](https://github.com/nf-core/fetchngs/pull/273) - Update utility subworkflows - [PR #283](https://github.com/nf-core/fetchngs/pull/283) - Template update for nf-core/tools v2.13 +- [PR #288](https://github.com/nf-core/fetchngs/pull/288) - Update Github Action to run full-sized test for all 3 download methods ### Software dependencies From 68d96f1f28f559ae81858b09834db717d059f676 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Thu, 22 Feb 2024 11:45:07 +0000 Subject: [PATCH 3/3] Add in missing strategy section --- .github/workflows/cloud_tests_full.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cloud_tests_full.yml b/.github/workflows/cloud_tests_full.yml index 7b049497..81cabbfd 100644 --- a/.github/workflows/cloud_tests_full.yml +++ b/.github/workflows/cloud_tests_full.yml @@ -73,8 +73,9 @@ jobs: run-full-tests-on-gcp: if: ${{ github.event.inputs.platform == 'gcp' || !github.event.inputs }} runs-on: ubuntu-latest - matrix: - download_method: ["aspera", "ftp", "sratools"] + strategy: + matrix: + download_method: ["aspera", "ftp", "sratools"] steps: - uses: seqeralabs/action-tower-launch@v2 with: