From 78824065d94194e45f6d2e6f470146867541fa5b Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Sat, 8 Jan 2022 17:39:35 +0100 Subject: [PATCH] Use Azure container reg for Azur batch test --- .github/workflows/build.yml | 1 + tests/checks/.IGNORE-JAVA-11 | 1 + validation/azure.config | 8 +++++++- validation/azure.sh | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/checks/.IGNORE-JAVA-11 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e1fa1b317..020b1684ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,6 +81,7 @@ jobs: AZURE_STORAGE_ACCOUNT_KEY: ${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }} AZURE_BATCH_ACCOUNT_NAME: nfbatchtest AZURE_BATCH_ACCOUNT_KEY: ${{ secrets.AZURE_BATCH_ACCOUNT_KEY }} + AZURE_BATCH_REGISTRY_PWD: $${{ secrets.AZURE_BATCH_REGISTRY_PWD }} - name: Tar integration tests if: failure() diff --git a/tests/checks/.IGNORE-JAVA-11 b/tests/checks/.IGNORE-JAVA-11 new file mode 100644 index 0000000000..0b36e91549 --- /dev/null +++ b/tests/checks/.IGNORE-JAVA-11 @@ -0,0 +1 @@ +ignite.nf \ No newline at end of file diff --git a/validation/azure.config b/validation/azure.config index 7e8bf71af9..3262321e1a 100644 --- a/validation/azure.config +++ b/validation/azure.config @@ -5,7 +5,7 @@ process { executor = 'azurebatch' - container = 'quay.io/nextflow/rnaseq-nf:v1.1' + container = 'seqeralabs.azurecr.io/nextflow/rnaseq-nf:v1.1' queue = 'nextflow-ci' } @@ -28,6 +28,12 @@ azure { vmType = 'Standard_D4_v3' } } + + registry { + server = 'seqeralabs.azurecr.io' + userName = 'seqeralabs' + password = "$AZURE_BATCH_REGISTRY_PWD" + } } } diff --git a/validation/azure.sh b/validation/azure.sh index 3aa67848d0..8e638f750a 100644 --- a/validation/azure.sh +++ b/validation/azure.sh @@ -9,10 +9,13 @@ export NXF_CMD=${NXF_CMD:-$(get_abs_filename ../launch.sh)} [[ $TOWER_ACCESS_TOKEN ]] && OPTS='-with-tower' || OPTS='' set -x + +if [[ ${TEST_JDK} == 11 ]]; then $NXF_CMD -C ./azure.config \ run nextflow-io/rnaseq-nf \ -with-report \ -with-trace $OPTS +fi $NXF_CMD -C ./azure.config \ run ./test-readspair.nf \