Enable ignition-gazebo CI on Windows (#388)

gazebo-tooling · Jan 28, 2021 · 364f285 · 364f285
1 parent c091a41
commit 364f285
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
@@ -627,8 +627,8 @@ ignition_software.each { ign_sw ->
                                     enable_testing(ign_sw))
   ignition_win_ci_any_job.with
   {
-     // ign-gazebo/ign-launch still not ported completely to Windows
-     if (ign_sw == 'gazebo' || ign_sw == 'launch')
+     // ign-launch still not ported completely to Windows
+     if (ign_sw == 'launch')
        disabled()
 
       steps {
@@ -663,8 +663,12 @@ ignition_software.each { ign_sw ->
 
     ignition_win_ci_job.with
     {
-        // ign-gazebo/ign-launch still not ported completely to Windows
-        if (ign_sw == 'gazebo' || ign_sw == 'launch')
+        // ign-gazebo only works in main by now (ign-gazebo5)
+        if (ign_sw == 'gazebo' && branch != 'main')
+          disabled()
+
+        // ign-launch still not ported completely to Windows
+        if (ign_sw == 'launch')
           disabled()
 
         triggers {