@@ -11,28 +11,32 @@ properties([
1111def agentSelector (String imageType , spotRetryCounter ) {
1212 def platform
1313 switch (imageType) {
14- // Linux
15- case ~/ linux|alpine*|debian*|rhel*/ :
16- // Need Docker and a LOT of memory for faster builds (due to multi archs)
17- platform = ' docker-highmem'
18- break
19-
20- // TODO: to be removed later cf https://github.com/jenkins-infra/helpdesk/issues/4954
21- // nanoserver 1809, ltsc2019 and windowservercore ltsc2019
14+ // TODO: to be removed later, when Windows 2019 support is dropped
15+ // cf https://github.com/jenkins-infra/helpdesk/issues/4954
16+ // nanoserver-1809, nanoserver-ltsc2019 and windowservercore-ltsc2019
2217 case ~/ .*9/ :
2318 platform = ' windows-2019'
2419 break
2520
26- // TODO: to be removed later cf https://github.com/jenkins-infra/helpdesk/issues/4956
27- // nanoserver ltsc2022 and windowservercore ltsc2022
21+ // TODO: to be removed later, when using Windows 2025 agents by default
22+ // cf https://github.com/jenkins-infra/helpdesk/issues/4956
23+ // nanoserver-ltsc2022 and windowservercore-ltsc2022
2824 case ~/ .*2/ :
2925 platform = ' windows-2022'
3026 break
3127
32- // Build on Windows 2025 agent by default
33- default :
28+ // TODO: to be replaced by ~/*server*/, when using Windows 2025 agents by default for Windows images
29+ // cf https://github.com/jenkins-infra/helpdesk/issues/4956
30+ // nanoserver-ltsc2025 and windowservercore-ltsc2025
31+ case ~/ .*5/ :
3432 platform = ' windows-2025'
3533 break
34+
35+ // Linux
36+ default :
37+ // Need Docker and a LOT of memory for faster builds (due to multi archs)
38+ platform = ' docker-highmem'
39+ break
3640 }
3741
3842 // Defined in https://github.com/jenkins-infra/pipeline-library/blob/master/vars/infra.groovy
0 commit comments