From 6728851b454c3d93e4586e4188dea37a7c0a61f0 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 12 Nov 2024 13:45:26 +0100 Subject: [PATCH 1/4] Add builds for cwin in fortress using DSL Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 5ecd6a915..1d9a2d162 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -380,6 +380,17 @@ gz_collections_yaml.collections.each { collection -> Globals.gazebodistro_branch = true gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win") generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config) + // DUPLICATE for conda + if (collection.name == 'fortress') { + gz_ci_job_conda = job("${gz_job_name_prefix}-${branch_number}-cwin") + generate_win_ci_job(gz_ci_job_conda, lib_name, branch_name, ci_config) + gz_ci_job_conda.with { + parameters { + booleanParam('USE_PIXI', true, 'Use experimental pixi env') + } + label "win && test-instance" + } + } Globals.gazebodistro_branch = false } else { assert false : "Unexpected config.system.so type: ${ci_config.system.so}" From ca6018dbd8e3c3152073b368c3d2ee38e947e8c6 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 15 Nov 2024 12:30:14 +0100 Subject: [PATCH 2/4] Override RTOOLS_BRANCH Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 1d9a2d162..85573c53a 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -387,6 +387,7 @@ gz_collections_yaml.collections.each { collection -> gz_ci_job_conda.with { parameters { booleanParam('USE_PIXI', true, 'Use experimental pixi env') + stringParam('RTOOLS_BRANCH','jrivero/support_conda','release-tool branch to use') } label "win && test-instance" } From 760ab8b2578515bcab0ce15167d142f7e95c3020 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 21 Nov 2024 16:38:04 +0100 Subject: [PATCH 3/4] Include harmonic in testing Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 85573c53a..61fe06657 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -381,7 +381,7 @@ gz_collections_yaml.collections.each { collection -> gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win") generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config) // DUPLICATE for conda - if (collection.name == 'fortress') { + if (collection.name == 'fortress' || collection.name == 'harmonic') { gz_ci_job_conda = job("${gz_job_name_prefix}-${branch_number}-cwin") generate_win_ci_job(gz_ci_job_conda, lib_name, branch_name, ci_config) gz_ci_job_conda.with { From 3679086d1125eb15a080d3cc337d0f3af4878597 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 18 Dec 2024 00:00:31 +0100 Subject: [PATCH 4/4] Include Ionic in the testing Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 61fe06657..5073c57da 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -381,7 +381,7 @@ gz_collections_yaml.collections.each { collection -> gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win") generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config) // DUPLICATE for conda - if (collection.name == 'fortress' || collection.name == 'harmonic') { + if (collection.name == 'fortress' || collection.name == 'harmonic' || collection.name == 'ionic') { gz_ci_job_conda = job("${gz_job_name_prefix}-${branch_number}-cwin") generate_win_ci_job(gz_ci_job_conda, lib_name, branch_name, ci_config) gz_ci_job_conda.with {