contrib/ci.inria.fr: use the "Pipeline: Step API" plugin to select unix nodes

Use nodesByLabel() to select nodes with the 'unix' label that are currently online.

Don't do it manually since it required authorizing several sensitive procedures.

Signed-off-by: Valentin Hoyet <[email protected]>

Author: Valentin Hoyet

contrib/ci.inria.fr/Jenkinsfile-basic

@@ -11,33 +11,12 @@
 // In "Additional Behaviours", enable "Checkout to specific local branch"
 // and leave "Branch name" empty.
 // Not needed for multi-branch pipelines which already BRANCH_NAME in the environment.
-import hudson.model.*
 
 def gitBranch = ""
 def tarballgz
 def tarballbz2
 def statusHasChanged = false
 
-def filterAvailableNode(nodeList) {
-  def nodeToDelete = []
-  nodeList.each { node ->
-    echo "Searching for $node";
-    if (node != null) {
-      computer = Jenkins.instance.getNode(node).toComputer();
-      if (computer.isOffline()) {
-        echo "Error: $node is offline.";
-        nodeToDelete.add(node);
-      }
-    }
-    else {
-      echo "Error: $node not found!";
-      nodeToDelete.add(node);
-    }
-  }
-
-  return nodeList.findAll { !nodeToDelete.contains(it) }
-}
-
 pipeline {
 	agent none
 
@@ -70,12 +49,7 @@ pipeline {
 				script {
 					listOfNodeNames = []
 					if (env.NO_UNIX != 'true') {
-						labelToSelect = 'unix'
-						listOfNodeNames = jenkins.model.Jenkins.instance.nodes.collect {
-						  node -> node.getLabelString().contains(labelToSelect) ? node.name : null
-						}
-						listOfNodeNames.removeAll(Collections.singleton(null))
-						listOfNodeNames = filterAvailableNode(listOfNodeNames)
+						listOfNodeNames = nodesByLabel('unix')
 					}
 					if (env.NO_MSVC != 'true') {
 						listOfNodeNames.push('VisualStudio')

contrib/ci.inria.fr/Jenkinsfile-extended

@@ -13,34 +13,13 @@
 // In "Additional Behaviours", enable "Checkout to specific local branch"
 // and leave "Branch name" empty.
 // Not needed for multi-branch pipelines which already BRANCH_NAME in the environment.
-import hudson.model.*
 
 def gitRepoURL = ""
 def gitBranch = ""
 def tarballgz
 def tarballbz2
 def statusHasChanged = false
 
-def filterAvailableNode(nodeList) {
-  def nodeToDelete = []
-  nodeList.each { node ->
-    echo "Searching for $node";
-    if (node != null) {
-      computer = Jenkins.instance.getNode(node).toComputer();
-      if (computer.isOffline()) {
-        echo "Error: $node is offline.";
-        nodeToDelete.add(node);
-      }
-    }
-    else {
-      echo "Error: $node not found!";
-      nodeToDelete.add(node);
-    }
-  }
-
-  return nodeList.findAll { !nodeToDelete.contains(it) }
-}
-
 pipeline {
         agent none
 
@@ -83,12 +62,7 @@ pipeline {
 				script {
 					listOfNodeNames = []
 					if (env.NO_UNIX != 'true') {
-						labelToSelect = 'unix'
-						listOfNodeNames = jenkins.model.Jenkins.instance.nodes.collect {
-						  node -> node.getLabelString().contains(labelToSelect) ? node.name : null
-						}
-						listOfNodeNames.removeAll(Collections.singleton(null))
-						listOfNodeNames = filterAvailableNode(listOfNodeNames)
+						listOfNodeNames = nodesByLabel('unix')
 					}
 					if (env.NO_MINGW != 'true') {
 						listOfNodeNames.push('MinGW')