hotfix(windows) compute Python installation dir from its version

Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Jan 2, 2025 · 0f9f9b2 · 0f9f9b2
1 parent ac461d2
commit 0f9f9b2
Showing 1 changed file with 6 additions and 3 deletions.
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}";
         };
     };
 }