@@ -19,6 +19,14 @@ logging_list = [:].withDefault {[]}
19
19
file = readFileFromWorkspace("scripts/jenkins-scripts/dsl/gz-collections.yaml" )
20
20
gz_collections_yaml = new Yaml().load(file)
21
21
22
+ String get_windows_distro_sortname(ci_config)
23
+ {
24
+ // return the components initials of the distribution and the version strings counting
25
+ // _ as separator for components.
26
+ return ci_config.system.distribution.split('_').collect { it[0 ] }.join('') \
27
+ + ci_config.system.version.split('_').collect { it[0 ] }.join('')
28
+ }
29
+
22
30
void generate_label_by_requirements(job, lib_name, requirements)
23
31
{
24
32
@@ -175,14 +183,19 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config)
175
183
add_brew_shell_build_step(gz_brew_ci_job, lib_name, ws_checkout_dir)
176
184
}
177
185
178
- void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir)
186
+ void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, config_version )
179
187
{
180
188
def script_name_prefix = cleanup_library_name(lib_name)
181
189
gz_win_ci_job.with
182
190
{
183
191
steps {
184
192
batchFile("" "\
185
193
set VCS_DIRECTORY=${ws_checkout_dir}
194
+ set CONDA_ENV_NAME=${config_version}
195
+ if not exist "/.scripts/conda/envs/%CONDA_ENV_NAME%" (
196
+ echo "Conda environment %CONDA_ENV_NAME% not found"
197
+ exit 1
198
+ )
186
199
call "./scripts/jenkins-scripts/${script_name_prefix}-default-devel-windows-amd64.bat"
187
200
"" ".stripIndent())
188
201
}
@@ -199,7 +212,11 @@ void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
199
212
"gazebosim/${lib_name}" ,
200
213
branch,
201
214
ws_checkout_dir)
202
- add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir)
215
+
216
+ add_win_devel_bat_call(gz_win_ci_job,
217
+ lib_name,
218
+ ws_checkout_dir,
219
+ ci_config.system.version)
203
220
}
204
221
205
222
@@ -336,7 +353,7 @@ gz_collections_yaml.collections.each { collection ->
336
353
} else if (ci_config.system.so == 'darwin') {
337
354
platform = 'homebrew'
338
355
} else if (ci_config.system.so == 'windows') {
339
- platform = 'windows'
356
+ platform = distro
340
357
}
341
358
branch_index[lib_name][platform] = branch_index[lib_name][platform]?: ['pr':[], 'pr_abichecker':[]]
342
359
if (categories_enabled.contains('pr'))
@@ -378,6 +395,9 @@ gz_collections_yaml.collections.each { collection ->
378
395
} else if (ci_config.system.so == 'windows') {
379
396
branch_number = branch_name - lib_name
380
397
Globals.gazebodistro_branch = true
398
+ distro_sort_name = get_windows_distro_sortname(ci_config)
399
+ // TODO(j-rivero): use when the new jobs needs to start
400
+ // gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-${distro_sort_name}-win")
381
401
gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win" )
382
402
generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config)
383
403
Globals.gazebodistro_branch = false
@@ -454,6 +474,9 @@ branch_index.each { lib_name, distro_configs ->
454
474
are_cmake_warnings_enabled(lib_name, ci_config))
455
475
add_brew_shell_build_step(gz_brew_ci_any_job, lib_name, ws_checkout_dir)
456
476
} else if (ci_config.system.so == 'windows') {
477
+ distro_sort_name = get_windows_distro_sortname(ci_config)
478
+ // TODO(j-rivero): use when the new jobs needs to start
479
+ // def gz_win_ci_any_job_name = "${gz_job_name_prefix}-pr-${distro_sort_name}-win"
457
480
def gz_win_ci_any_job_name = "${gz_job_name_prefix}-pr-win"
458
481
def gz_win_ci_any_job = job(gz_win_ci_any_job_name)
459
482
Globals.gazebodistro_branch = true
@@ -463,7 +486,10 @@ branch_index.each { lib_name, distro_configs ->
463
486
branch_names,
464
487
ENABLE_GITHUB_PR_INTEGRATION,
465
488
are_cmake_warnings_enabled(lib_name, ci_config))
466
- add_win_devel_bat_call(gz_win_ci_any_job, lib_name, ws_checkout_dir)
489
+ add_win_devel_bat_call(gz_win_ci_any_job,
490
+ lib_name,
491
+ ws_checkout_dir,
492
+ ci_config.system.version)
467
493
Globals.gazebodistro_branch = false
468
494
}
469
495
}
0 commit comments