Skip to content

Commit e9aff89

Browse files
beau-lunargbeau-lunarg
committed
Remove 32-bit Jenkins pipeline configuration
1 parent 54d7a6b commit e9aff89

9 files changed

Lines changed: 29 additions & 60 deletions

‎ci/Jenkinsfile‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,17 @@ pipeline {
7474
def runJob = load 'ci/runJob.groovy'
7575

7676
tests = [
77-
'Android Rel64': runJob.gfxrTestAndroid('Android R64', runJob.ReleaseMode, runJob.AndroidLabel, runJob.Bit64, "commit-suite.json", scm.branches),
78-
// 'Android Dbg32': runJob.gfxrTestAndroid('Android D32', runJob.ReleaseMode, runJob.AndroidLabel, runJob.Bit32, "commit-suite.json", scm.branches),
79-
'Linux Mesa Rel64': runJob.gfxrTestLinux('Linux Mesa Rel64', runJob.ReleaseMode, runJob.LinuxMesaLabel, runJob.Bit64, "commit-suite.json", scm.branches),
80-
'Linux Mesa Dbg32': runJob.gfxrTestLinux('Linux Mesa Dbg32', runJob.ReleaseMode, runJob.LinuxMesaLabel, runJob.Bit32, "commit-suite.json", scm.branches),
81-
'Linux Nnvidia Rel64': runJob.gfxrTestLinux('Linux Nvidia Rel64', runJob.ReleaseMode, runJob.LinuxNvidiaLabel, runJob.Bit64, "commit-suite.json", scm.branches),
82-
'Linux Nnvidia Dbg32': runJob.gfxrTestLinux('Linux Nvidia Dbg32', runJob.ReleaseMode, runJob.LinuxNvidiaLabel, runJob.Bit32, "commit-suite.json", scm.branches),
83-
'Mac': runJob.gfxrTestLinux('Mac', runJob.ReleaseMode, runJob.MacLabel, runJob.Bit64, "commit-suite.json", scm.branches),
84-
'Windows AMD Rel64': runJob.gfxrTestWindows('Win AMD Rel64', runJob.ReleaseMode, runJob.WinAMDLabel, runJob.Bit64, "commit-suite.json", scm.branches),
85-
'Windows AMD Dbg32': runJob.gfxrTestWindows('Win AMD Dbg32', runJob.ReleaseMode, runJob.WinAMDLabel, runJob.Bit32, "commit-suite.json", scm.branches),
86-
'Windows Nvidia Rel64': runJob.gfxrTestWindows('Win Nvidia Rel64', runJob.ReleaseMode, runJob.WinNvidiaLabel, runJob.Bit64, "commit-suite.json", scm.branches),
87-
'Windows Nvidia Dbg32': runJob.gfxrTestWindows('Win Nvidia Dbg32', runJob.ReleaseMode, runJob.WinNvidiaLabel, runJob.Bit32, "commit-suite.json", scm.branches),
88-
'Windows11 AMD Rel64': runJob.gfxrTestWindows('Win11 AMD Rel64', runJob.ReleaseMode, runJob.Win11AMDLabel, runJob.Bit64, "commit-suite.json", scm.branches),
89-
'Windows11 AMD Dbg32': runJob.gfxrTestWindows('Win11 AMD Dbg32', runJob.ReleaseMode, runJob.Win11AMDLabel, runJob.Bit32, "commit-suite.json", scm.branches),
90-
'Windows11 ARM Rel64': runJob.gfxrTestWindows('Win11 ARM Rel64', runJob.ReleaseMode, runJob.Win11ARMLabel, runJob.Bit64, "commit-suite.json", scm.branches),
91-
'Windows11 ARM Dbg64': runJob.gfxrTestWindows('Win11 ARM Dbg64', runJob.ReleaseMode, runJob.Win11ARMLabel, runJob.Bit64, "commit-suite.json", scm.branches),
92-
'Windows11 AMD 9070 Rel64': runJob.gfxrTestWindows('Win11 AMD 9070 Rel64', runJob.ReleaseMode, runJob.Win11AMD9070Label, runJob.Bit64, "commit-suite.json", scm.branches),
93-
'Windows11 AMD 9070 Dbg32': runJob.gfxrTestWindows('Win11 AMD 9070 Dbg32', runJob.ReleaseMode, runJob.Win11AMD9070Label, runJob.Bit32, "commit-suite.json", scm.branches),
94-
'Windows11 Nvidia 5080 Rel64': runJob.gfxrTestWindows('Win11 Nvidia 5080 Rel64', runJob.ReleaseMode, runJob.Win11Nvidia50XXLabel, runJob.Bit64, "commit-suite.json", scm.branches),
95-
'Windows11 Nvidia 5080 Dbg32': runJob.gfxrTestWindows('Win11 Nvidia 5080 Dbg32', runJob.ReleaseMode, runJob.Win11Nvidia50XXLabel, runJob.Bit32, "commit-suite.json", scm.branches),
77+
'Android Rel': runJob.gfxrTestAndroid('Android Rel', runJob.ReleaseMode, runJob.AndroidLabel, "commit-suite.json", scm.branches),
78+
'Linux Mesa Rel': runJob.gfxrTestLinux('Linux Mesa Rel', runJob.ReleaseMode, runJob.LinuxMesaLabel, "commit-suite.json", scm.branches),
79+
'Linux Nnvidia Rel': runJob.gfxrTestLinux('Linux Nvidia Rel', runJob.ReleaseMode, runJob.LinuxNvidiaLabel, "commit-suite.json", scm.branches),
80+
'Mac': runJob.gfxrTestLinux('Mac', runJob.ReleaseMode, runJob.MacLabel, "commit-suite.json", scm.branches),
81+
'Windows AMD Rel': runJob.gfxrTestWindows('Win AMD Rel', runJob.ReleaseMode, runJob.WinAMDLabel, "commit-suite.json", scm.branches),
82+
'Windows Nvidia Rel': runJob.gfxrTestWindows('Win Nvidia Rel', runJob.ReleaseMode, runJob.WinNvidiaLabel, "commit-suite.json", scm.branches),
83+
'Windows11 AMD Rel': runJob.gfxrTestWindows('Win11 AMD Rel', runJob.ReleaseMode, runJob.Win11AMDLabel, "commit-suite.json", scm.branches),
84+
'Windows11 ARM Rel': runJob.gfxrTestWindows('Win11 ARM Rel', runJob.ReleaseMode, runJob.Win11ARMLabel, "commit-suite.json", scm.branches),
85+
'Windows11 ARM Dbg': runJob.gfxrTestWindows('Win11 ARM Dbg', runJob.ReleaseMode, runJob.Win11ARMLabel, "commit-suite.json", scm.branches),
86+
'Windows11 AMD 9070 Rel': runJob.gfxrTestWindows('Win11 AMD 9070 Rel', runJob.ReleaseMode, runJob.Win11AMD9070Label, "commit-suite.json", scm.branches),
87+
'Windows11 Nvidia 5080 Rel': runJob.gfxrTestWindows('Win11 Nvidia 5080 Rel', runJob.ReleaseMode, runJob.Win11Nvidia50XXLabel, "commit-suite.json", scm.branches),
9688
]
9789
}
9890
// Run the test closures in parallel. This is outside the

‎ci/Jenkinsfile.extended‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ pipeline {
137137
def runJob = load 'ci/runJob.groovy'
138138

139139
tests = [
140-
'Android Rel64': runJob.gfxrTestAndroid('Android R64 Ext', runJob.ReleaseMode, runJob.AndroidLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
141-
'Linux Mesa Rel64': runJob.gfxrTestLinux('Linux Mesa Rel64 Ext', runJob.ReleaseMode, runJob.LinuxMesaLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
142-
'Linux Nvidia Rel64': runJob.gfxrTestLinux('Linux Nvidia Rel64 Ext', runJob.ReleaseMode, runJob.LinuxNvidiaLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
143-
'Windows AMD Rel64': runJob.gfxrTestWindows('Win AMD Rel64 Ext', runJob.ReleaseMode, runJob.WinAMDExtendedLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
144-
'Windows Nvidia Rel64': runJob.gfxrTestWindows('Win Nvidia Rel64 Ext', runJob.ReleaseMode, runJob.WinNvidiaExtendedLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
145-
'Windows11 AMD 9070 Rel64': runJob.gfxrTestWindows('Win11 AMD 9070 Rel64 Ext', runJob.ReleaseMode, runJob.Win11AMD9070Label, runJob.Bit64, "extended-suite.json", requestedBranches),
146-
'Windows11 Nvidia 50XX Rel64': runJob.gfxrTestWindows('Win11 Nvidia 50XX Rel64 Ext', runJob.ReleaseMode, runJob.Win11Nvidia50XXLabel, runJob.Bit64, "extended-suite.json", requestedBranches),
140+
'Android Rel': runJob.gfxrTestAndroid('Android Rel Ext', runJob.ReleaseMode, runJob.AndroidLabel, "extended-suite.json", requestedBranches),
141+
'Linux Mesa Rel': runJob.gfxrTestLinux('Linux Mesa Rel Ext', runJob.ReleaseMode, runJob.LinuxMesaLabel, "extended-suite.json", requestedBranches),
142+
'Linux Nvidia Rel': runJob.gfxrTestLinux('Linux Nvidia Rel Ext', runJob.ReleaseMode, runJob.LinuxNvidiaLabel, "extended-suite.json", requestedBranches),
143+
'Windows AMD Rel': runJob.gfxrTestWindows('Win AMD Rel Ext', runJob.ReleaseMode, runJob.WinAMDExtendedLabel, "extended-suite.json", requestedBranches),
144+
'Windows Nvidia Rel': runJob.gfxrTestWindows('Win Nvidia Rel Ext', runJob.ReleaseMode, runJob.WinNvidiaExtendedLabel, "extended-suite.json", requestedBranches),
145+
'Windows11 AMD 9070 Rel': runJob.gfxrTestWindows('Win11 AMD 9070 Rel Ext', runJob.ReleaseMode, runJob.Win11AMD9070Label, "extended-suite.json", requestedBranches),
146+
'Windows11 Nvidia 50XX Rel': runJob.gfxrTestWindows('Win11 Nvidia 50XX Rel Ext', runJob.ReleaseMode, runJob.Win11Nvidia50XXLabel, "extended-suite.json", requestedBranches),
147147
]
148148
}
149149
// The closures allocate their own platform-specific agents.

‎ci/Jenkinsfile.extended-manual‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,49 +86,49 @@ pipeline {
8686
def runJob = load 'ci/runJob.groovy'
8787

8888
tests = [
89-
'Android Rel64': runJob.gfxrTestAndroidManual('Android R64', runJob.AndroidLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
89+
'Android Rel': runJob.gfxrTestAndroidManual('Android Rel', runJob.AndroidLabel, runJob.ReleaseMode, params.TEST_SUITE,
9090
params.PROJECT_REPO,
9191
params.PROJECT_BRANCH,
9292
params.TEST_REPO,
9393
params.TEST_BRANCH,
9494
params.TEST_SUITE_REPO,
9595
params.TEST_SUITE_BRANCH),
96-
'Linux Mesa Rel64': runJob.gfxrTestLinuxManual('Linux Mesa Rel64', runJob.LinuxMesaLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
96+
'Linux Mesa Rel': runJob.gfxrTestLinuxManual('Linux Mesa Rel', runJob.LinuxMesaLabel, runJob.ReleaseMode, params.TEST_SUITE,
9797
params.PROJECT_REPO,
9898
params.PROJECT_BRANCH,
9999
params.TEST_REPO,
100100
params.TEST_BRANCH,
101101
params.TEST_SUITE_REPO,
102102
params.TEST_SUITE_BRANCH),
103-
'Linux Nvidia Rel64': runJob.gfxrTestLinuxManual('Linux Nvidia Rel64', runJob.LinuxNvidiaLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
103+
'Linux Nvidia Rel': runJob.gfxrTestLinuxManual('Linux Nvidia Rel', runJob.LinuxNvidiaLabel, runJob.ReleaseMode, params.TEST_SUITE,
104104
params.PROJECT_REPO,
105105
params.PROJECT_BRANCH,
106106
params.TEST_REPO,
107107
params.TEST_BRANCH,
108108
params.TEST_SUITE_REPO,
109109
params.TEST_SUITE_BRANCH),
110-
'Windows AMD Rel64': runJob.gfxrTestWindowsManual('Win AMD Rel64', runJob.WinAMDExtendedLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
110+
'Windows AMD Rel': runJob.gfxrTestWindowsManual('Win AMD Rel', runJob.WinAMDExtendedLabel, runJob.ReleaseMode, params.TEST_SUITE,
111111
params.PROJECT_REPO,
112112
params.PROJECT_BRANCH,
113113
params.TEST_REPO,
114114
params.TEST_BRANCH,
115115
params.TEST_SUITE_REPO,
116116
params.TEST_SUITE_BRANCH),
117-
'Windows Nvidia Rel64': runJob.gfxrTestWindowsManual('Win Nvidia Rel64', runJob.WinNvidiaExtendedLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
117+
'Windows Nvidia Rel': runJob.gfxrTestWindowsManual('Win Nvidia Rel', runJob.WinNvidiaExtendedLabel, runJob.ReleaseMode, params.TEST_SUITE,
118118
params.PROJECT_REPO,
119119
params.PROJECT_BRANCH,
120120
params.TEST_REPO,
121121
params.TEST_BRANCH,
122122
params.TEST_SUITE_REPO,
123123
params.TEST_SUITE_BRANCH),
124-
'Windows11 AMD 9070 Rel64': runJob.gfxrTestWindowsManual('Win11 AMD 9070 Rel64', runJob.Win11AMD9070Label, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
124+
'Windows11 AMD 9070 Rel': runJob.gfxrTestWindowsManual('Win11 AMD 9070 Rel', runJob.Win11AMD9070Label, runJob.ReleaseMode, params.TEST_SUITE,
125125
params.PROJECT_REPO,
126126
params.PROJECT_BRANCH,
127127
params.TEST_REPO,
128128
params.TEST_BRANCH,
129129
params.TEST_SUITE_REPO,
130130
params.TEST_SUITE_BRANCH),
131-
'Windows11 Nvidia 50XX Rel64': runJob.gfxrTestWindowsManual('Win11 Nvidia 50XX Rel64', runJob.Win11Nvidia50XXLabel, runJob.ReleaseMode, runJob.Bit64, params.TEST_SUITE,
131+
'Windows11 Nvidia 50XX Rel': runJob.gfxrTestWindowsManual('Win11 Nvidia 50XX Rel', runJob.Win11Nvidia50XXLabel, runJob.ReleaseMode, params.TEST_SUITE,
132132
params.PROJECT_REPO,
133133
params.PROJECT_BRANCH,
134134
params.TEST_REPO,

‎ci/Jenkinsfile.manual‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ pipeline {
6565
choices: ['Release', 'Debug'],
6666
description: 'Build mode'
6767
)
68-
choice(
69-
name: 'BITS',
70-
choices: ['64', '32'],
71-
description: 'Build architecture'
72-
)
7368
string(
7469
name: 'NODES',
7570
defaultValue: '',
@@ -119,7 +114,6 @@ pipeline {
119114
nodeName,
120115
nodeName,
121116
params.BUILD_MODE,
122-
params.BITS,
123117
params.TEST_SUITE,
124118
params.PROJECT_REPO,
125119
params.PROJECT_BRANCH,
@@ -134,7 +128,6 @@ pipeline {
134128
nodeName,
135129
nodeName,
136130
params.BUILD_MODE,
137-
params.BITS,
138131
params.TEST_SUITE,
139132
params.PROJECT_REPO,
140133
params.PROJECT_BRANCH,
@@ -149,7 +142,6 @@ pipeline {
149142
nodeName,
150143
nodeName,
151144
params.BUILD_MODE,
152-
params.BITS,
153145
params.TEST_SUITE,
154146
params.PROJECT_REPO,
155147
params.PROJECT_BRANCH,

‎ci/runJob.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ python --version
8282
python -m venv %WORKSPACE%\python-venv
8383
%WORKSPACE%\python-venv\Scripts\python -m pip install --no-cache-dir -r VulkanTests\requirements.txt > %WORKSPACE%\python-venv.txt 2>&1 || exit /b
8484

85-
%WORKSPACE%\python-venv\Scripts\python VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% --bits %BITS% %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"
85+
%WORKSPACE%\python-venv\Scripts\python VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"

‎ci/runJob.groovy‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ def gfxrTestWindows(
2525
String name,
2626
String buildMode,
2727
String label,
28-
String bits,
2928
String testSuite,
3029
def branches
3130
) {
@@ -68,7 +67,6 @@ def gfxrTestWindows(
6867
"TEST_REPO=git@github.com:LunarG/VulkanTests",
6968
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
7069
"TEST_SUITE=${testSuite}",
71-
"BITS=${bits}",
7270
"BUILD_MODE=${buildMode}",
7371
"RESULTS_DIR=../vulkantest-results/${name}"
7472
]) {
@@ -104,7 +102,6 @@ def gfxrTestLinux(
104102
String name,
105103
String buildMode,
106104
String label,
107-
String bits,
108105
String testSuite,
109106
def branches
110107
) {
@@ -145,7 +142,6 @@ def gfxrTestLinux(
145142
"TEST_REPO=git@github.com:LunarG/VulkanTests",
146143
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
147144
"TEST_SUITE=${testSuite}",
148-
"BITS=${bits}",
149145
"BUILD_MODE=${buildMode}",
150146
"RESULTS_DIR=../vulkantest-results/${name}"
151147
]) {
@@ -181,7 +177,6 @@ def gfxrTestAndroid(
181177
String name,
182178
String buildMode,
183179
String label,
184-
String bits,
185180
String testSuite,
186181
def branches
187182
) {
@@ -222,7 +217,6 @@ def gfxrTestAndroid(
222217
"TEST_REPO=git@github.com:LunarG/VulkanTests",
223218
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
224219
"TEST_SUITE=${testSuite}",
225-
"BITS=${bits}",
226220
"BUILD_MODE=${buildMode}",
227221
"RESULTS_DIR=../vulkantest-results/${name}"
228222
]) {
@@ -273,7 +267,6 @@ def gfxrTestWindowsManual(
273267
String stageName,
274268
String nodeLabel,
275269
String buildMode,
276-
String bits,
277270
String testSuite,
278271
String projectRepo,
279272
String projectBranch,
@@ -317,7 +310,6 @@ def gfxrTestWindowsManual(
317310
"TEST_SUITE_REPO=${testSuiteRepo}",
318311
"TEST_SUITE_BRANCH=${testSuiteBranch}",
319312
"TEST_SUITE=${testSuite}",
320-
"BITS=${bits}",
321313
"BUILD_MODE=${buildMode}",
322314
"RESULTS_DIR=../vulkantest-results/${stageName}"
323315
]) {
@@ -353,7 +345,6 @@ def gfxrTestLinuxManual(
353345
String stageName,
354346
String nodeLabel,
355347
String buildMode,
356-
String bits,
357348
String testSuite,
358349
String projectRepo,
359350
String projectBranch,
@@ -397,7 +388,6 @@ def gfxrTestLinuxManual(
397388
"TEST_SUITE_REPO=${testSuiteRepo}",
398389
"TEST_SUITE_BRANCH=${testSuiteBranch}",
399390
"TEST_SUITE=${testSuite}",
400-
"BITS=${bits}",
401391
"BUILD_MODE=${buildMode}",
402392
"RESULTS_DIR=../vulkantest-results/${stageName}"
403393
]) {
@@ -433,7 +423,6 @@ def gfxrTestAndroidManual(
433423
String stageName,
434424
String nodeLabel,
435425
String buildMode,
436-
String bits,
437426
String testSuite,
438427
String projectRepo,
439428
String projectBranch,
@@ -477,7 +466,6 @@ def gfxrTestAndroidManual(
477466
"TEST_SUITE_REPO=${testSuiteRepo}",
478467
"TEST_SUITE_BRANCH=${testSuiteBranch}",
479468
"TEST_SUITE=${testSuite}",
480-
"BITS=${bits}",
481469
"BUILD_MODE=${buildMode}",
482470
"RESULTS_DIR=../vulkantest-results/${stageName}"
483471
]) {
@@ -511,9 +499,6 @@ def gfxrTestAndroidManual(
511499

512500

513501
return [
514-
Bit64 : '64',
515-
Bit32 : '32',
516-
517502
ReleaseMode : 'Release',
518503
DebugMode : 'Debug',
519504

0 commit comments

Comments
 (0)