Use Azure container reg for Azur batch test

nextflow-io · Jan 8, 2022 · 7882406 · 7882406
1 parent ceceb07
commit 7882406
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -0,0 +1 @@
+ignite.nf
diff --git 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
@@ -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 \