Do not generate ignition_sim-* jobs (#845)

Signed-off-by: Jose Luis Rivero <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
gazebo-tooling · Nov 3, 2022 · 0faf091 · 0faf091
1 parent 440a592
commit 0faf091
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
@@ -499,7 +499,7 @@ void generate_asan_ci_job(gz_ci_job, gz_sw, branch, distro, arch)
 {
   generate_ci_job(gz_ci_job, gz_sw, branch, distro, arch,
                   '-DGZ_SANITIZER=Address',
-                  Globals.MAKETEST_SKIP_GZ,                  
+                  Globals.MAKETEST_SKIP_GZ,
                   'export ASAN_OPTIONS=check_initialization_order=true')
 }
 
@@ -727,6 +727,9 @@ gz_software.each { gz_sw ->
 // 1. any
 gz_software.each { gz_sw ->
 
+  if (gz_sw == 'sim')
+    return
+
   if (is_a_colcon_package(gz_sw)) {
     // colcon uses long paths and windows has a hard limit of 260 chars. Keep
     // names minimal
@@ -738,12 +741,10 @@ gz_software.each { gz_sw ->
   }
 
   supported_branches = []
-  gz_software_name = gz_sw  // Necessary substitution. gz_sw won't overwrite
 
   // ign-gazebo only support Windows from ign-gazebo5
   if (gz_sw == 'gazebo') {
     supported_branches = [ 'ign-gazebo6', 'gz-sim7', 'main' ]
-    gz_software_name = "sim"
   }
 
   // ign-launch only support Windows from ign-launch5
@@ -762,7 +763,7 @@ gz_software.each { gz_sw ->
       if (gz_sw == 'gui' ||
           gz_sw == 'rendering' ||
           gz_sw == 'sensors' ||
-          gz_software_name == 'sim')
+          gz_sw == 'gazebo')
         label('win_rendering')
 
 
@@ -821,14 +822,16 @@ gz_software.each { gz_sw ->
         if (gz_sw == 'gui' ||
             gz_sw == 'rendering' ||
             gz_sw == 'sensors' ||
-            gz_software_name == 'sim')
+            gz_sw == 'gazebo')
           label('win_rendering')
     }
   }
 }
 
 // Main CI workflow
 gz_software.each { gz_sw ->
+  if (gz_sw == 'sim')
+    return
   def String ci_main_name = "ignition_${gz_sw}-ci-manual_any"
   def gz_ci_main = pipelineJob(ci_main_name)
   OSRFCIWorkFlowMultiAnyGitHub.create(gz_ci_main, ci_pr_any_list[gz_sw])