From ed076b70059f6f0a5f47c3769e315e3c236abb0f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 11 Oct 2021 19:24:31 +0200 Subject: [PATCH] Enable ign-launch5 windows jobs. Add it to Fortress --- jenkins-scripts/dsl/ignition.dsl | 6 +++--- jenkins-scripts/dsl/ignition_collection.dsl | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 7f6415553..7667e0312 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -613,7 +613,7 @@ ignition_software.each { ign_sw -> // ign-launch only support Windows from ign-launch5 if (ign_sw == 'launch') - supported_branches = [ 'main' ] + supported_branches = [ 'ign-launch5', 'main' ] def ignition_win_ci_any_job = job(ignition_win_ci_any_job_name) OSRFWinCompilationAnyGitHub.create(ignition_win_ci_any_job, @@ -662,8 +662,8 @@ ignition_software.each { ign_sw -> if (branch == 'ign-gazebo3' || branch == 'ign-gazebo4') disabled() - // ign-launch still not ported completely to Windows - if (ign_sw == 'launch' && branch != 'main') + // ign-launch was not ported to windows until 5 + if (branch == 'ign-launch2' || branch == 'ign-launch3' || branch == 'ign-launch4') disabled() triggers { diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index 2a58a6c5d..5d3b91507 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -288,6 +288,7 @@ ignition_collection_jobs = 'ign_fuel-tools-ign-7-win', 'ign_gazebo-ign-6-win', 'ign_gui-ign-6-win', + 'ign_launch-ign-5-win', 'ign_physics-ign-5-win', 'ign_plugin-ign-1-win', 'ign_rendering-ign-6-win',