Skip to content

Commit c99c29b

Browse files
committed
Use conda environments in gz-collections
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
1 parent 4b681b5 commit c99c29b

File tree

2 files changed

+66
-12
lines changed

2 files changed

+66
-12
lines changed

jenkins-scripts/dsl/gazebo_libs.dsl

+30-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ logging_list = [:].withDefault {[]}
1919
file = readFileFromWorkspace("scripts/jenkins-scripts/dsl/gz-collections.yaml")
2020
gz_collections_yaml = new Yaml().load(file)
2121

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+
2230
void generate_label_by_requirements(job, lib_name, requirements)
2331
{
2432

@@ -175,14 +183,19 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config)
175183
add_brew_shell_build_step(gz_brew_ci_job, lib_name, ws_checkout_dir)
176184
}
177185

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)
179187
{
180188
def script_name_prefix = cleanup_library_name(lib_name)
181189
gz_win_ci_job.with
182190
{
183191
steps {
184192
batchFile("""\
185193
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+
)
186199
call "./scripts/jenkins-scripts/${script_name_prefix}-default-devel-windows-amd64.bat"
187200
""".stripIndent())
188201
}
@@ -199,7 +212,11 @@ void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
199212
"gazebosim/${lib_name}",
200213
branch,
201214
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)
203220
}
204221

205222

@@ -336,7 +353,7 @@ gz_collections_yaml.collections.each { collection ->
336353
} else if (ci_config.system.so == 'darwin') {
337354
platform = 'homebrew'
338355
} else if (ci_config.system.so == 'windows') {
339-
platform = 'windows'
356+
platform = distro
340357
}
341358
branch_index[lib_name][platform] = branch_index[lib_name][platform]?: ['pr':[], 'pr_abichecker':[]]
342359
if (categories_enabled.contains('pr'))
@@ -378,6 +395,9 @@ gz_collections_yaml.collections.each { collection ->
378395
} else if (ci_config.system.so == 'windows') {
379396
branch_number = branch_name - lib_name
380397
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")
381401
gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win")
382402
generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config)
383403
Globals.gazebodistro_branch = false
@@ -454,6 +474,9 @@ branch_index.each { lib_name, distro_configs ->
454474
are_cmake_warnings_enabled(lib_name, ci_config))
455475
add_brew_shell_build_step(gz_brew_ci_any_job, lib_name, ws_checkout_dir)
456476
} 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"
457480
def gz_win_ci_any_job_name = "${gz_job_name_prefix}-pr-win"
458481
def gz_win_ci_any_job = job(gz_win_ci_any_job_name)
459482
Globals.gazebodistro_branch = true
@@ -463,7 +486,10 @@ branch_index.each { lib_name, distro_configs ->
463486
branch_names,
464487
ENABLE_GITHUB_PR_INTEGRATION,
465488
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)
467493
Globals.gazebodistro_branch = false
468494
}
469495
}

jenkins-scripts/dsl/gz-collections.yaml

+36-8
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ collections:
100100
configs:
101101
- focal
102102
- brew
103-
- win
103+
- win_conda_L
104104
packaging:
105105
configs:
106106
- focal
@@ -184,7 +184,7 @@ collections:
184184
- jammy
185185
- noble_no_pr
186186
- brew
187-
- win
187+
- win_conda_LO23
188188
packaging:
189189
configs:
190190
- jammy
@@ -267,7 +267,7 @@ collections:
267267
configs:
268268
- noble
269269
- brew
270-
- win
270+
- win_conda_LO23
271271
packaging:
272272
configs:
273273
- noble
@@ -349,7 +349,7 @@ collections:
349349
configs:
350350
- noble
351351
- brew
352-
- win
352+
- win_conda_LO23
353353
packaging:
354354
configs:
355355
- noble
@@ -427,7 +427,7 @@ collections:
427427
configs:
428428
- noble
429429
- brew
430-
- win
430+
- win_conda_LO23
431431
packaging:
432432
configs:
433433
- noble
@@ -588,16 +588,44 @@ ci_configs:
588588
ci_categories_enabled:
589589
- pr
590590
- stable_branches
591-
- name: win
591+
- name: win_conda_L
592592
system:
593593
so: windows
594-
distribution: windows
595-
version: "10"
594+
distribution: conda
595+
version: legacy
596596
arch: amd64
597597
requirements:
598598
exclude:
599599
all:
600600
- gz-fortress
601+
cmake_warnings_disabled:
602+
- gz-cmake
603+
- gz-common
604+
- gz-fuel-tools
605+
- gz-sim
606+
- gz-gui
607+
- gz-launch
608+
- gz-math
609+
- gz-msgs
610+
- gz-physics
611+
- gz-rendering
612+
- gz-sensors
613+
- gz-tools
614+
- gz-transport
615+
- gz-utils
616+
- sdformat
617+
ci_categories_enabled:
618+
- pr
619+
- stable_branches
620+
- name: win_conda_LO23
621+
system:
622+
so: windows
623+
distribution: conda
624+
version: legacy_ogre23
625+
arch: amd64
626+
requirements:
627+
exclude:
628+
all:
601629
- gz-harmonic
602630
- gz-ionic
603631
- gz-jetty

0 commit comments

Comments
 (0)