Skip to content

Commit efd43a3

Browse files
authored
jenkins: remove outdated labels from VersionSelectorScript.groovy (nodejs#3449)
1 parent 7b5d0a4 commit efd43a3

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ def buildExclusions = [
2020
// Machine Label, Build Type, Node Version
2121

2222
// Linux -------------------------------------------------
23-
[ /^centos7-(arm)?(64|32)-gcc48/, anyType, gte(16) ],
24-
[ /^centos7-(arm)?(64|32)-gcc6/, anyType, gte(16) ], // 14.x: gcc6 builds stop
25-
[ /^centos7-(arm)?(64)-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop
23+
[ /^centos7-(arm)?64-gcc48/, anyType, gte(16) ],
24+
[ /^centos7-(arm)?64-gcc6/, anyType, gte(16) ], // 14.x: gcc6 builds stop
25+
[ /^centos7-(arm)?64-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop
2626
[ /^centos7-64/, anyType, gte(18) ],
27-
[ /debian8-x86/, anyType, gte(16) ], // 32-bit linux for <10 only
2827
[ /debian8/, anyType, gte(16) ],
2928
[ /debian9/, anyType, gte(16) ],
3029
[ /rhel7/, anyType, gte(18) ],
@@ -36,7 +35,6 @@ def buildExclusions = [
3635
[ /^centos7-ppcle/, anyType, gte(18) ],
3736

3837
// ARM --------------------------------------------------
39-
[ /^debian8-docker-armv7$/, anyType, gte(16) ],
4038
[ /^debian10-armv7l$/, anyType, gte(20) ], // gcc 10 requires newer libstdc++
4139
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-4.9/, anyType, gte(16) ],
4240
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/, anyType, gte(16) ],
@@ -45,41 +43,26 @@ def buildExclusions = [
4543
[ /^cross-compiler-rhel8-armv7-gcc-8-glibc-2.28/, anyType, lt(18) ],
4644
[ /^cross-compiler-rhel8-armv7-gcc-8-glibc-2.28/, anyType, gte(20) ],
4745
[ /^cross-compiler-rhel8-armv7-gcc-10-glibc-2.28/, anyType, lt(20) ],
48-
[ /^ubuntu1604-arm64/, anyType, gte(16) ],
4946

5047
// Windows -----------------------------------------------
5148
// https://github.com/nodejs/build/blob/main/doc/windows-visualstudio-supported-versions.md
5249
// Release Builders - should only match one VS version per Node.js version
53-
[ /vs2013/, releaseType, gte(16) ],
5450
[ /vs2015/, releaseType, gte(16) ],
5551
[ /vs2017/, releaseType, gte(16) ],
5652
[ /vs2019-arm64/, releaseType, lt(20) ],
5753
// VS versions supported to compile Node.js - also matches labels used by test runners
58-
[ /vs2013(-\w+)?$/, testType, gte(16) ],
5954
[ /vs2015(-\w+)?$/, testType, gte(16) ],
60-
[ /vcbt2015(-\w+)?$/, testType, gte(16) ],
6155
[ /vs2017(-\w+)?$/, testType, gte(16) ],
6256
[ /vs2022(-\w+)?$/, testType, lt(20) ], // Temporarily compile Node v20+ on both VS2019 and VS2022
63-
[ /vs2015-x86$/, testType, gte(16) ], // compile arm64/x86 only once
64-
[ /vs2017-x86$/, testType, gte(16) ],
6557
[ /vs2022-x86$/, testType, lt(20) ], // Temporarily compile Node v20+ arm64 and x86 on both VS2019 and VS2022
6658
[ /vs2022-arm64$/, testType, lt(20) ],
6759
[ /COMPILED_BY-\w+-arm64$/, testType, lt(20) ], // run tests on arm64 for >=19
6860
// VS versions supported to build add-ons
69-
[ /vs2013-COMPILED_BY/, testType, gte(16) ],
7061
[ /vs2015-COMPILED_BY/, testType, gte(20) ],
71-
[ /vcbt2015-COMPILED_BY/, testType, gte(20) ],
72-
// Exclude some redundant configurations
73-
// https://github.com/nodejs/build/blob/main/doc/node-test-commit-matrix.md
74-
[ /win10.*COMPILED_BY-vs2017/, testType, gte(16) ], // vs2019 runs on win10 for >=13
7562

7663
// SmartOS -----------------------------------------------
77-
[ /^smartos18/, releaseType, gte(16) ],
7864
[ /^smartos18/, anyType, gte(16) ],
7965

80-
// AIX PPC64 ---------------------------------------------
81-
[ /aix71/, anyType, gte(16) ],
82-
8366
// Shared libs docker containers -------------------------
8467
[ /sharedlibs_debug_x64/, anyType, gte(18) ],
8568
[ /sharedlibs_openssl110/, anyType, gte(16) ],
@@ -91,9 +74,6 @@ def buildExclusions = [
9174
[ /osx1015-release-pkg/, releaseType, gte(16) ],
9275
[ /osx1015-release-tar/, releaseType, gte(20) ],
9376

94-
// FreeBSD -----------------------------------------------
95-
[ /^freebsd10/, anyType, gte(16) ],
96-
9777
// Source / headers / docs -------------------------------
9878
[ /^centos7-release-sources$/, releaseType, gte(18) ],
9979
[ /^rhel8-release-sources$/, releaseType, lt(18) ],

0 commit comments

Comments
 (0)