try out pipeline lib PoC

Author: lemeurherve

Jenkinsfile

@@ -1,3 +1,5 @@
+@Library('pipeline-library@pull/980/head') _
+
 final String cronExpr = env.BRANCH_IS_PRIMARY ? '@daily' : ''
 
 properties([
@@ -9,47 +11,36 @@ properties([
 def agentSelector(String imageType, spotRetryCounter) {
     def platform
     switch (imageType) {
-        // Linux
-        case ~/linux|alpine*|debian*|rhel*/:
-            // Need Docker and a LOT of memory for faster builds (due to multi archs)
-            platform = 'docker-highmem'
-            // Fallback to 'linux' on trusted.ci
-            if (infra.isTrusted()) {
-                platform = 'linux'
-            }
-            break
-
-        // TODO: to be removed later cf https://github.com/jenkins-infra/helpdesk/issues/4954
-        // nanoserver 1809, ltsc2019 and windowservercore ltsc2019
+        // TODO: to be removed later, when Windows 2019 support is dropped
+        // cf https://github.com/jenkins-infra/helpdesk/issues/4954
+        // nanoserver-1809, nanoserver-ltsc2019 and windowservercore-ltsc2019
         case ~/.*9/:
             platform = 'windows-2019'
             break
 
-        // TODO: to be removed later cf https://github.com/jenkins-infra/helpdesk/issues/4956
-        // nanoserver ltsc2022 and windowservercore ltsc2022
+        // TODO: to be removed later, when using Windows 2025 agents by default
+        // cf https://github.com/jenkins-infra/helpdesk/issues/4956
+        // nanoserver-ltsc2022 and windowservercore-ltsc2022
         case ~/.*2/:
             platform = 'windows-2022'
             break
 
-        // Build on Windows 2025 agent by default
-        default:
+        // TODO: to be replaced by ~/*server*/, when using Windows 2025 agents by default for Windows images
+        // cf https://github.com/jenkins-infra/helpdesk/issues/4956
+        // nanoserver-ltsc2025 and windowservercore-ltsc2025
+        case ~/.*5/:
             platform = 'windows-2025'
             break
-    }
 
-    // Defined in https://github.com/jenkins-infra/pipeline-library/blob/master/vars/infra.groovy
-    def agentLabel = infra.getBuildAgentLabel(platform, 'any', false)
-
-    // Spot/Non-spot
-    if (infra.isTrusted()) {
-        return agentLabel
-    }
-
-    if (spotRetryCounter > 1) {
-        return agentLabel + ' && nonspot'
+        // Linux
+        default:
+            // Need Docker and a LOT of memory for faster builds (due to multi archs)
+            platform = 'docker-highmem'
+            break
     }
 
-    return agentLabel + ' && spot'
+    // Defined in https://github.com/jenkins-infra/pipeline-library/blob/master/vars/infra.groovy
+    return infra.getBuildAgentLabel(platform, 'any', false, spotRetryCounter)
 }
 
 // Specify parallel stages
@@ -65,11 +56,11 @@ def parallelStages = [failFast: false]
 ].each { imageType ->
     parallelStages[imageType] = {
         withEnv(["IMAGE_TYPE=${imageType}", "REGISTRY_ORG=${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"]) {
-            int spotRetryCounter = 0
+            int retryCounter = 0
             retry(count: 2, conditions: [agent(), nonresumable()]) {
                 // Use local variable to manage concurrency and increment BEFORE spinning up any agent
-                final String resolvedAgentLabel = agentSelector(imageType, spotRetryCounter)
-                spotRetryCounter++
+                final String resolvedAgentLabel = agentSelector(imageType, retryCounter)
+                retryCounter++
                 node(resolvedAgentLabel) {
                     timeout(time: 60, unit: 'MINUTES') {
                         checkout scm