Merge branch 'master' of https://github.com/AtlasOfLivingAustralia/ala-install

Author: matthewandrews

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Dwc-verbatim-all/config.xml.j2

@@ -86,8 +86,8 @@ stage ('Clear file locks') {
     datasets.removeAll(batch3.split(" "))
     datasets.removeAll(batch4.split(" "))
 
-    //split into 6 batches
-    def batches = ["",""]
+    //split into n-node batches
+    def batches = [""] * jenkins.model.Jenkins.instance.nodes.size()
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(2)] =  batches[index.mod(2)] + " " + datasetId 
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Image-load-all/config.xml.j2

@@ -54,8 +54,8 @@ stage('Run image load on jenkins nodes') {
 }
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Image-sync-all/config.xml.j2

@@ -52,8 +52,8 @@ stage('Interpret small datasets on jenkins nodes') {
 }
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Index-all/config.xml.j2

@@ -79,8 +79,8 @@ stage('Index small datasets on jenkins nodes') {
 
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Interpret-all/config.xml.j2

@@ -111,8 +111,8 @@ stage('Interpret small datasets on jenkins nodes') {
 }
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Interpret-small-datasets/config.xml.j2

@@ -87,8 +87,8 @@ stage('Interpret small datasets on jenkins nodes') {
 }
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/Restart-docker-services/config.xml.j2

@@ -6,7 +6,10 @@
 
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.90">
-    <script>nodeNames().each { nodeName -&gt;
+    <script>// Skip if we are not using docker
+def use_docker_with_pipelines = {{ use_docker_with_pipelines | string | lower }}
+if (!use_docker_with_pipelines) return
+nodeNames().each { nodeName -&gt;
     node(nodeName) {
       echo 'nodeName ' + nodeName
       sh 'sudo sh -c "docker kill $(docker ps -q)" || true'

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/SDS-all/config.xml.j2

@@ -83,8 +83,8 @@ stage('SDS small datasets on jenkins nodes') {
 
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/SDS-small-datasets/config.xml.j2

@@ -79,8 +79,8 @@ stage('SDS small datasets on jenkins nodes') {
 
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }

ansible/roles/pipelines_jenkins/templates/jenkins/jobs/UUID-all/config.xml.j2

@@ -76,8 +76,8 @@ stage('UUID small datasets on jenkins nodes') {
 
 
 @NonCPS def batchDatasets(datasets, noOfBatches){
-    //split into 6 batches
-    def batches = ["","","","","",""]
+    //split into n-node batches
+    def batches = [""] * noOfBatches
     datasets.eachWithIndex { datasetId, index -> 
         batches[index.mod(noOfBatches)] = datasetId + " " + batches[index.mod(noOfBatches)]
     }