Skip to content

Commit 9da30cd

Browse files
beau-lunargbeau-lunarg
committed
Restore manual Jenkins bitness option
1 parent a29c8e2 commit 9da30cd

7 files changed

Lines changed: 30 additions & 13 deletions

File tree

‎ci/Jenkinsfile.extended-manual‎

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

8888
tests = [
89-
'Android Rel': runJob.gfxrTestAndroidManual('Android Rel', runJob.AndroidLabel, runJob.ReleaseMode, params.TEST_SUITE,
89+
'Android Rel': runJob.gfxrTestAndroidManual('Android Rel', runJob.AndroidLabel, runJob.ReleaseMode, '64', 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 Rel': runJob.gfxrTestLinuxManual('Linux Mesa Rel', runJob.LinuxMesaLabel, runJob.ReleaseMode, params.TEST_SUITE,
96+
'Linux Mesa Rel': runJob.gfxrTestLinuxManual('Linux Mesa Rel', runJob.LinuxMesaLabel, runJob.ReleaseMode, '64', 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 Rel': runJob.gfxrTestLinuxManual('Linux Nvidia Rel', runJob.LinuxNvidiaLabel, runJob.ReleaseMode, params.TEST_SUITE,
103+
'Linux Nvidia Rel': runJob.gfxrTestLinuxManual('Linux Nvidia Rel', runJob.LinuxNvidiaLabel, runJob.ReleaseMode, '64', 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-
'Linux Mesa 9070 Rel': runJob.gfxrTestLinuxManual('Linux Mesa 9070 Rel64 Ext', runJob.LinuxMesa9070Label, runJob.ReleaseMode, params.TEST_SUITE,
110+
'Linux Mesa 9070 Rel': runJob.gfxrTestLinuxManual('Linux Mesa 9070 Rel64 Ext', runJob.LinuxMesa9070Label, runJob.ReleaseMode, '64', 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-
'Linux Nvidia 5080 Rel': runJob.gfxrTestLinuxManual('Linux Nvidia 5080 Rel64 Ext', runJob.LinuxNvidia5080Label, runJob.ReleaseMode, params.TEST_SUITE,
117+
'Linux Nvidia 5080 Rel': runJob.gfxrTestLinuxManual('Linux Nvidia 5080 Rel64 Ext', runJob.LinuxNvidia5080Label, runJob.ReleaseMode, '64', 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-
'Windows AMD Rel': runJob.gfxrTestWindowsManual('Win AMD Rel', runJob.WinAMDExtendedLabel, runJob.ReleaseMode, params.TEST_SUITE,
124+
'Windows AMD Rel': runJob.gfxrTestWindowsManual('Win AMD Rel', runJob.WinAMDExtendedLabel, runJob.ReleaseMode, '64', 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-
'Windows Nvidia Rel': runJob.gfxrTestWindowsManual('Win Nvidia Rel', runJob.WinNvidiaExtendedLabel, runJob.ReleaseMode, params.TEST_SUITE,
131+
'Windows Nvidia Rel': runJob.gfxrTestWindowsManual('Win Nvidia Rel', runJob.WinNvidiaExtendedLabel, runJob.ReleaseMode, '64', params.TEST_SUITE,
132132
params.PROJECT_REPO,
133133
params.PROJECT_BRANCH,
134134
params.TEST_REPO,
135135
params.TEST_BRANCH,
136136
params.TEST_SUITE_REPO,
137137
params.TEST_SUITE_BRANCH),
138-
'Windows11 AMD 9070 Rel': runJob.gfxrTestWindowsManual('Win11 AMD 9070 Rel', runJob.Win11AMD9070Label, runJob.ReleaseMode, params.TEST_SUITE,
138+
'Windows11 AMD 9070 Rel': runJob.gfxrTestWindowsManual('Win11 AMD 9070 Rel', runJob.Win11AMD9070Label, runJob.ReleaseMode, '64', params.TEST_SUITE,
139139
params.PROJECT_REPO,
140140
params.PROJECT_BRANCH,
141141
params.TEST_REPO,
142142
params.TEST_BRANCH,
143143
params.TEST_SUITE_REPO,
144144
params.TEST_SUITE_BRANCH),
145-
'Windows11 Nvidia 50XX Rel': runJob.gfxrTestWindowsManual('Win11 Nvidia 50XX Rel', runJob.Win11Nvidia50XXLabel, runJob.ReleaseMode, params.TEST_SUITE,
145+
'Windows11 Nvidia 50XX Rel': runJob.gfxrTestWindowsManual('Win11 Nvidia 50XX Rel', runJob.Win11Nvidia50XXLabel, runJob.ReleaseMode, '64', params.TEST_SUITE,
146146
params.PROJECT_REPO,
147147
params.PROJECT_BRANCH,
148148
params.TEST_REPO,

‎ci/Jenkinsfile.manual‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ pipeline {
6565
choices: ['Release', 'Debug'],
6666
description: 'Build mode'
6767
)
68+
choice(
69+
name: 'BITS',
70+
choices: ['64', '32'],
71+
description: 'Build architecture'
72+
)
6873
string(
6974
name: 'NODES',
7075
defaultValue: '',
@@ -114,6 +119,7 @@ pipeline {
114119
nodeName,
115120
nodeName,
116121
params.BUILD_MODE,
122+
params.BITS,
117123
params.TEST_SUITE,
118124
params.PROJECT_REPO,
119125
params.PROJECT_BRANCH,
@@ -128,6 +134,7 @@ pipeline {
128134
nodeName,
129135
nodeName,
130136
params.BUILD_MODE,
137+
params.BITS,
131138
params.TEST_SUITE,
132139
params.PROJECT_REPO,
133140
params.PROJECT_BRANCH,
@@ -142,6 +149,7 @@ pipeline {
142149
nodeName,
143150
nodeName,
144151
params.BUILD_MODE,
152+
params.BITS,
145153
params.TEST_SUITE,
146154
params.PROJECT_REPO,
147155
params.PROJECT_BRANCH,

‎ci/buildGfxr.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ echo creating Python virtual environment in %WORKSPACE%\python-venv...
2929
python -m venv "%WORKSPACE%\python-venv"
3030
"%WORKSPACE%\python-venv\Scripts\python" -m pip install --no-cache-dir -r VulkanTests\requirements.txt > "%WORKSPACE%\python-venv.txt" 2>&1 || exit /b
3131

32-
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --no-test --compiler vs2022 --build-mode %BUILD_MODE% --bits 64 --result-dir "%RESULTS_DIR%-build"
32+
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --no-test --compiler vs2022 --build-mode %BUILD_MODE% --bits %BITS% --result-dir "%RESULTS_DIR%-build"

‎ci/buildGfxr.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ echo creating Python virtual environment in "$WORKSPACE/python-venv"...
2626
python3 -m venv "$WORKSPACE/python-venv"
2727
"$WORKSPACE/python-venv/bin/python3" -m pip install --no-cache-dir -r VulkanTests/requirements.txt > "$WORKSPACE/python-venv.txt" 2>&1
2828

29-
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --no-test --build-mode "$BUILD_MODE" --bits 64 --result-dir "$RESULTS_DIR-build"
29+
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --no-test --build-mode "$BUILD_MODE" --bits "$BITS" --result-dir "$RESULTS_DIR-build"

‎ci/runJob.groovy‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def gfxrTestWindows(
6767
"TEST_REPO=git@github.com:LunarG/VulkanTests",
6868
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
6969
"TEST_SUITE=${testSuite}",
70+
"BITS=64",
7071
"BUILD_MODE=${buildMode}",
7172
"RESULTS_DIR=../vulkantest-results/${name}"
7273
]) {
@@ -143,6 +144,7 @@ def gfxrTestLinux(
143144
"TEST_REPO=git@github.com:LunarG/VulkanTests",
144145
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
145146
"TEST_SUITE=${testSuite}",
147+
"BITS=64",
146148
"BUILD_MODE=${buildMode}",
147149
"RESULTS_DIR=../vulkantest-results/${name}"
148150
]) {
@@ -219,6 +221,7 @@ def gfxrTestAndroid(
219221
"TEST_REPO=git@github.com:LunarG/VulkanTests",
220222
"TEST_SUITE_REPO=git@github.com:LunarG/ci-gfxr-suites",
221223
"TEST_SUITE=${testSuite}",
224+
"BITS=64",
222225
"BUILD_MODE=${buildMode}",
223226
"RESULTS_DIR=../vulkantest-results/${name}"
224227
]) {
@@ -270,6 +273,7 @@ def gfxrTestWindowsManual(
270273
String stageName,
271274
String nodeLabel,
272275
String buildMode,
276+
String bits,
273277
String testSuite,
274278
String projectRepo,
275279
String projectBranch,
@@ -313,6 +317,7 @@ def gfxrTestWindowsManual(
313317
"TEST_SUITE_REPO=${testSuiteRepo}",
314318
"TEST_SUITE_BRANCH=${testSuiteBranch}",
315319
"TEST_SUITE=${testSuite}",
320+
"BITS=${bits}",
316321
"BUILD_MODE=${buildMode}",
317322
"RESULTS_DIR=../vulkantest-results/${stageName}"
318323
]) {
@@ -349,6 +354,7 @@ def gfxrTestLinuxManual(
349354
String stageName,
350355
String nodeLabel,
351356
String buildMode,
357+
String bits,
352358
String testSuite,
353359
String projectRepo,
354360
String projectBranch,
@@ -392,6 +398,7 @@ def gfxrTestLinuxManual(
392398
"TEST_SUITE_REPO=${testSuiteRepo}",
393399
"TEST_SUITE_BRANCH=${testSuiteBranch}",
394400
"TEST_SUITE=${testSuite}",
401+
"BITS=${bits}",
395402
"BUILD_MODE=${buildMode}",
396403
"RESULTS_DIR=../vulkantest-results/${stageName}"
397404
]) {
@@ -428,6 +435,7 @@ def gfxrTestAndroidManual(
428435
String stageName,
429436
String nodeLabel,
430437
String buildMode,
438+
String bits,
431439
String testSuite,
432440
String projectRepo,
433441
String projectBranch,
@@ -471,6 +479,7 @@ def gfxrTestAndroidManual(
471479
"TEST_SUITE_REPO=${testSuiteRepo}",
472480
"TEST_SUITE_BRANCH=${testSuiteBranch}",
473481
"TEST_SUITE=${testSuite}",
482+
"BITS=${bits}",
474483
"BUILD_MODE=${buildMode}",
475484
"RESULTS_DIR=../vulkantest-results/${stageName}"
476485
]) {

‎ci/runTest.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ echo creating Python virtual environment in %WORKSPACE%\python-venv...
2727
python -m venv "%WORKSPACE%\python-venv"
2828
"%WORKSPACE%\python-venv\Scripts\python" -m pip install --no-cache-dir -r VulkanTests\requirements.txt > "%WORKSPACE%\python-venv.txt" 2>&1 || exit /b
2929

30-
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --no-build --compiler vs2022 --build-mode %BUILD_MODE% --bits 64 %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"
30+
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --no-build --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%"

‎ci/runTest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ echo creating Python virtual environment in $WORKSPACE/python-venv...
2626
python3 -m venv "$WORKSPACE/python-venv"
2727
"$WORKSPACE/python-venv/bin/python3" -m pip install --no-cache-dir -r VulkanTests/requirements.txt > "$WORKSPACE/python-venv.txt" 2>&1
2828

29-
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --no-build --build-mode ${BUILD_MODE} --bits 64 $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"
29+
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --no-build --build-mode ${BUILD_MODE} --bits "$BITS" $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"

0 commit comments

Comments
 (0)