Merge branch 'master' into dependabot/github_actions/master/release-drafter/release-drafter-6.2.0

Author: lemeurherve

Jenkinsfile

@@ -6,38 +6,37 @@ properties([
     pipelineTriggers([cron(cronExpr)]),
 ])
 
-def agentSelector(String imageType) {
-    // Linux agent
-    if (imageType == 'linux') {
-        // This function is defined in the jenkins-infra/pipeline-library
-        if (infra.isTrusted()) {
-            return 'linux'
-        } else {
-            // Need Docker and a LOT of memory for faster builds (due to multi archs) or fallback to linux (trusted.ci)
-            return 'docker-highmem'
-        }
-    }
-    // Windows Server Core 2022 agent
-    if (imageType.contains('2022')) {
-        return 'windows-2022'
-    }
-    // Windows Server Core 2019 agent (for nanoserver 1809 & ltsc2019 and for windowservercore ltsc2019)
-    return 'windows-2019'
-}
+def agentSelector(String imageType, retryCounter) {
+    def platform
+    switch (imageType) {
+        // nanoserver-1809, nanoserver-ltsc2019 and windowservercore-ltsc2019
+        case ~/.*(1809|2019)/:
+            platform = 'windows-2019'
+            break
 
-// Ref. https://github.com/jenkins-infra/pipeline-library/pull/917
-def spotAgentSelector(String agentLabel, int counter) {
-    // This function is defined in the jenkins-infra/pipeline-library
-    if (infra.isTrusted()) {
-        // Return early if on trusted (no spot agent)
-        return agentLabel
-    }
+        // nanoserver-ltsc2022 and windowservercore-ltsc2022
+        case ~/.*2022/:
+            platform = 'windows-2022'
+            break
+
+        // nanoserver-ltsc2025 and windowservercore-ltsc2025
+        case ~/.*2025/:
+            platform = 'windows-2025'
+            break
 
-    if (counter > 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([
+        useContainerAgent: false,
+        platform: platform,
+        spotRetryCounter: retryCounter
+    ])
 }
 
 // Specify parallel stages
@@ -56,7 +55,7 @@ def parallelStages = [failFast: false]
             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 = spotAgentSelector(agentSelector(imageType), retryCounter)
+                final String resolvedAgentLabel = agentSelector(imageType, retryCounter)
                 retryCounter++
                 node(resolvedAgentLabel) {
                     timeout(time: 60, unit: 'MINUTES') {

README.md

@@ -145,7 +145,7 @@ $ make show
       "context": ".",
       "dockerfile": "alpine/Dockerfile",
       "args": {
-        "ALPINE_TAG": "3.23.2",
+        "ALPINE_TAG": "3.23.3",
         "JAVA_VERSION": "17.0.17_10",
         "VERSION": "3355.v388858a_47b_33"
       },

alpine/Dockerfile

@@ -19,7 +19,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-ARG ALPINE_TAG=3.23.2
+ARG ALPINE_TAG=3.23.3
 FROM alpine:"${ALPINE_TAG}" AS jre-build
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

build.ps1

@@ -211,14 +211,7 @@ foreach($agentType in $AgentTypes) {
             $mod = Get-InstalledModule -Name Pester -MinimumVersion 5.3.0 -MaximumVersion 5.3.3 -ErrorAction SilentlyContinue
             if ($null -eq $mod) {
                 Write-Host '= TEST: Pester 5.3.x not found: installing...'
-                $module = 'C:\Program Files\WindowsPowerShell\Modules\Pester'
-                if (Test-Path $module) {
-                    takeown /F $module /A /R
-                    icacls $module /reset
-                    icacls $module /grant Administrators:'F' /inheritance:d /T
-                    Remove-Item -Path $module -Recurse -Force -Confirm:$false
-                }
-                Install-Module -Force -Name Pester -MaximumVersion 5.3.3
+                Install-Module -Force -Name Pester -MaximumVersion 5.3.3 -Scope CurrentUser
             }
 
             Import-Module Pester

docker-bake.hcl

@@ -55,7 +55,7 @@ variable "ON_TAG" {
 }
 
 variable "ALPINE_FULL_TAG" {
-  default = "3.23.2"
+  default = "3.23.3"
 }
 
 variable "ALPINE_SHORT_TAG" {
@@ -67,7 +67,7 @@ variable "DEBIAN_RELEASE" {
 }
 
 variable "UBI9_TAG" {
-  default = "9.7-1768785530"
+  default = "9.7-1769417801"
 }
 
 # Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function

rhel/ubi9/Dockerfile

@@ -1,4 +1,4 @@
-ARG UBI9_TAG=9.7-1768785530
+ARG UBI9_TAG=9.7-1769417801
 FROM registry.access.redhat.com/ubi9/ubi:"${UBI9_TAG}" AS jre-build
 SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]