Merge pull request #1620 from jenkins-infra/updatecli_main_2069c03719…

…7af68ddd6a68a8065530ff3a4c40696f8f57f39cd43a0d3472bd10 Bump python3 version to 3.13.1
jenkins-infra · Jan 2, 2025 · f1b48fa · f1b48fa
2 parents 8dc4010 + 0f9f9b2
commit f1b48fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/provisioning/tools-versions.yml b/provisioning/tools-versions.yml
@@ -37,7 +37,7 @@ nodejs_linux_version: 22.12.0
 nodejs_windows_version: 22.12.0
 openssh_authorized_keys_url: https://raw.githubusercontent.com/jenkins-infra/aws/main/ec2_agents_authorized_keys
 packer_version: 1.11.2
-python3_version: 3.12.6
+python3_version: 3.13.1
 ruby_puppet_version: 2.6.10
 ruby_version: 3.4.1
 sops_version: 3.9.3

diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1
@@ -83,6 +83,9 @@ New-Item -ItemType Directory -Path $baseDir -Force | Out-Null
 $dockerPluginsDir = 'C:\ProgramData\docker\cli-plugins'
 New-Item -ItemType Directory -Path $dockerPluginsDir -Force | Out-Null
 
+# Compute the future python installation dir
+$pythondir = 'C:\python{0}' -f "${env:PYTHON3_VERSION}".Replace(".", "").Substring(0, 3)
+
 # Ensure NuGet package provider is initialized (non-interactively)
 Get-PackageProvider NuGet -ForceBootstrap
 
@@ -258,7 +261,7 @@ $downloads = [ordered]@{
             & Remove-Item -Force -Recurse "$baseDir\chocolatey.tmp";
         };
         'cleanupLocal' = 'true';
-        'path' = "C:\HashiCorp\Vagrant\;C:\Program Files\Amazon\AWSCLIV2\;c:\python312\;C:\python312\Scripts\;";
+        'path' = "C:\HashiCorp\Vagrant\;C:\Program Files\Amazon\AWSCLIV2\;${pythondir}\;${pythondir}\Scripts\;";
         'postInstall' = {
             # Installation of make for Windows
             & "choco.exe" install make --yes --no-progress --limit-output --fail-on-error-output;
@@ -280,8 +283,8 @@ $downloads = [ordered]@{
             # Installation of python3 for Launchable
             & "choco.exe" install python3 --yes --no-progress --limit-output --fail-on-error-output --version "${env:PYTHON3_VERSION}";
             # Installation of Launchable globally (no other python tool)
-            & "c:\python312\python.exe" -m pip --no-cache-dir --upgrade install setuptools wheel pip;
-            & "c:\python312\python.exe" -m pip --no-cache-dir install launchable=="${env:LAUNCHABLE_VERSION}";
+            & "${pythondir}\python.exe" -m pip --no-cache-dir --upgrade install setuptools wheel pip;
+            & "${pythondir}\python.exe" -m pip --no-cache-dir install launchable=="${env:LAUNCHABLE_VERSION}";
         };
     };
 }

diff --git a/tests/goss-windows.yaml b/tests/goss-windows.yaml
@@ -50,7 +50,7 @@ command:
     exec: python --version
     exit-status: 0
     stdout:
-      - 3.12.6
+      - 3.13.1
   ruby:
     exec: ruby -v
     exit-status: 0