Multi Visual Studio version support

job_templates/ci_job.xml.em

@@ -242,10 +242,15 @@ rmdir /S /Q ws workspace "work space"
 echo "# BEGIN SECTION: Build DockerFile"
 set CONTAINER_NAME=ros2_windows_ci_%CI_ROS_DISTRO%
 set DOCKERFILE=windows_docker_resources\Dockerfile
+set SOLO_FILE=windows_docker_resources\install_ros2_%CI_ROS_DISTRO%.json
+set VISUAL_STUDIO_VERSION=%CI_VISUAL_STUDIO_VERSION%
 
 rem "Change dockerfile once per day to invalidate docker caches"
 powershell "(Get-Content ${Env:DOCKERFILE}).replace('@@todays_date', $(Get-Date).ToLongDateString()) | Set-Content ${Env:DOCKERFILE}"
 
+rem "Change the chef-solo configuration file to set a specific Visual Studio version.
+powershell -noexit "(Get-Content ${Env:SOLO_FILE}).replace('@@vs_version', ${Env:VISUAL_STUDIO_VERSION}) | Set-Content ${Env:SOLO_FILE}"
+
 rem "Finding the Release Version is much easier with powershell than cmd"
 powershell $(Get-ItemProperty -Path 'HKLM:SOFTWARE\Microsoft\Windows NT\CurrentVersion\Update\TargetingInfo\Installed\Server.OS.amd64' -Name Version).Version > release_version.txt
 set /p RELEASE_VERSION=< release_version.txt

job_templates/packaging_job.xml.em

@@ -238,10 +238,15 @@ rmdir /S /Q ws workspace
 
 set CONTAINER_NAME=ros2_windows_ci_%CI_ROS_DISTRO%
 set DOCKERFILE=windows_docker_resources\Dockerfile
+set SOLO_FILE=windows_docker_resources\install_ros2_%CI_ROS_DISTRO%.json
+set VISUAL_STUDIO_VERSION=%CI_VISUAL_STUDIO_VERSION%
 
 rem "Change dockerfile once per day to invalidate docker caches"
 powershell "(Get-Content ${Env:DOCKERFILE}).replace('@@todays_date', $(Get-Date).ToLongDateString()) | Set-Content ${Env:DOCKERFILE}"
 
+rem "Change the chef-solo configuration file to set a specific Visual Studio version.
+powershell -noexit "(Get-Content ${Env:SOLO_FILE}).replace('@@vs_version', ${Env:VISUAL_STUDIO_VERSION}) | Set-Content ${Env:SOLO_FILE}"
+
 rem "Finding the Release Version is much easier with powershell than cmd"
 powershell $(Get-ItemProperty -Path 'HKLM:SOFTWARE\Microsoft\Windows NT\CurrentVersion\Update\TargetingInfo\Installed\Server.OS.amd64' -Name Version).Version > release_version.txt
 set /p RELEASE_VERSION=< release_version.txt

job_templates/snippet/property_parameter-definition_common.xml.em

@@ -124,7 +124,7 @@ choices.remove(cmake_build_type)
  <choices class="java.util.Arrays$ArrayList">
  <a class="string-array">
  <string>2019</string>
- <string>2017</string>
+ <string>2022</string>
  </a>
  </choices>
  </hudson.model.ChoiceParameterDefinition>

ros2_batch_job/windows_batch/__init__.py

@@ -45,10 +45,8 @@ def setup_env(self):
  with open('env.bat', 'w') as f:
  f.write("@echo off" + os.linesep)
  assert self.args.visual_studio_version is not None
- f.write(
- 'call '
- '"C:\\Program Files (x86)\\Microsoft Visual Studio\\%s\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" ' %
- self.args.visual_studio_version + 'x86_amd64' + os.linesep)
+ vs = self.args.visual_studio_version
+ f.write(f'call "C:\\Program Files (x86)\\Microsoft Visual Studio\\{vs}\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat" x86_amd64' + os.linesep)
  f.write("%*" + os.linesep)
  f.write("if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%" + os.linesep)
 

windows_docker_resources/Dockerfile

@@ -30,7 +30,7 @@ COPY cacert.pem c:\cinc-project\cinc\embedded\lib\ruby\gems\2.7.0\gems\httpclien
 
 # Install Chocolatey by powershell script
 
-# Pining chocolatey version to 1.4.0 previous one to major bump to 2.0.0 due to issues with chocolatey_package chef resource 
+# Pinning chocolatey version to 1.4.0 previous one to major bump to 2.0.0 due to issues with chocolatey_package chef resource
 # See https://github.com/chef/chef/issues/13751 for more detail of the issue
 # This should be solved for chef version 18; see https://github.com/chef/chef/pull/13833
 RUN powershell -noexit "$env:chocolateyDownloadUrl = 'https://community.chocolatey.org/api/v2/package/chocolatey/1.4.0'; Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
@@ -66,5 +66,5 @@ RUN echo "@todays_date"
 RUN c:\cinc-project\cinc\bin\cinc-solo.bat -c C:\TEMP\solo.rb -Eros2ci -j C:\TEMP\install_ros2_%ROS_DISTRO%.json
 
 WORKDIR C:\ci
-CMD ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat", "x86_amd64", "&&", `
- "python", "run_ros2_batch.py", "%CI_ARGS%"]
+# Note that this *must* be in shell form, not exec form, so Docker on Windows appropriately substitutes %CI_ARGS%
+CMD "python run_ros2_batch.py %CI_ARGS%"

windows_docker_resources/install_ros2_humble.json

@@ -2,6 +2,7 @@
  "ros2_windows": {
  "download_sources": "false",
  "vs_version": "buildtools",
+ "vs_release": "@vs_version",
  "qt5": {
  "installation_method": "offline"
  },

windows_docker_resources/install_ros2_iron.json

@@ -2,6 +2,7 @@
  "ros2_windows": {
  "download_sources": "false",
  "vs_version": "buildtools",
+ "vs_release": "@vs_version",
  "qt5": {
  "installation_method": "offline"
  },

windows_docker_resources/install_ros2_jazzy.json

@@ -2,6 +2,7 @@
  "ros2_windows": {
  "download_sources": "false",
  "vs_version": "buildtools",
+ "vs_release": "@vs_version",
  "qt5": {
  "installation_method": "offline"
  },

windows_docker_resources/install_ros2_rolling.json

@@ -2,6 +2,7 @@
  "ros2_windows": {
  "download_sources": "false",
  "vs_version": "buildtools",
+ "vs_release": "@vs_version",
  "qt5": {
  "installation_method": "offline"
  },