Use requirements in -pr- jobs on Windows (#1275)

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
gazebo-tooling · Mar 4, 2025 · 0cb5665 · 0cb5665
1 parent 09c8efb
commit 0cb5665
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl
@@ -185,16 +185,17 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config)
   add_brew_shell_build_step(gz_brew_ci_job, lib_name, ws_checkout_dir)
 }
 
-void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, config_version)
+void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, ci_config)
 {
   def script_name_prefix = cleanup_library_name(lib_name)
+  def conda_env = ci_config.system.version
   gz_win_ci_job.with
   {
     steps {
       batchFile("""\
             set VCS_DIRECTORY=${ws_checkout_dir}
             set USE_PIXI=true
-            set CONDA_ENV_NAME=${config_version}
+            set CONDA_ENV_NAME=${conda_env}
             if defined USE_PIXI (
             if not exist "./scripts/conda/envs/%CONDA_ENV_NAME%" (
               echo "Conda environment %CONDA_ENV_NAME% not found"
@@ -205,6 +206,8 @@ void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, config_ver
             """.stripIndent())
     }
   }
+  // Include the labels in the windows job
+  generate_label_by_requirements(gz_win_ci_job, lib_name, ci_config.requirements, 'win')
 }
 
 void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
@@ -217,11 +220,10 @@ void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
                     "gazebosim/${lib_name}",
                     branch,
                     ws_checkout_dir)
-  generate_label_by_requirements(gz_win_ci_job, lib_name, ci_config.requirements, 'win')
   add_win_devel_bat_call(gz_win_ci_job,
                          lib_name,
                          ws_checkout_dir,
-                         ci_config.system.version)
+                         ci_config)
 }
 
 
@@ -506,7 +508,7 @@ branch_index.each { lib_name, distro_configs ->
         add_win_devel_bat_call(gz_win_ci_any_job,
                                lib_name,
                                ws_checkout_dir,
-                               ci_config.system.version)
+                               ci_config)
         Globals.gazebodistro_branch = false
       }
     }