From 5ad3f04bf6262ce11aaf174e55acab0680c430bf Mon Sep 17 00:00:00 2001 From: "Jenkins Infra Bot (updatecli)" <60776566+jenkins-infra-bot@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:33:31 +0000 Subject: [PATCH 1/3] chore: Update the `python3` version in the goss test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- tests/goss-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/goss-windows.yaml b/tests/goss-windows.yaml index 4fef2745e..1239a5807 100644 --- 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 From ac461d2539b11b1b43d5716d79ea8dbd51c66982 Mon Sep 17 00:00:00 2001 From: "Jenkins Infra Bot (updatecli)" <60776566+jenkins-infra-bot@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:33:32 +0000 Subject: [PATCH 2/3] chore: Update the python3 version in the tools-versions.yml file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- provisioning/tools-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/tools-versions.yml b/provisioning/tools-versions.yml index 711691ed8..66d2e83fe 100644 --- 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.3.6 sops_version: 3.9.3 From 0f9f9b2a0fa0639e614ae2e9302af7a57d4e2748 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Thu, 2 Jan 2025 14:59:20 +0100 Subject: [PATCH 3/3] hotfix(windows) compute Python installation dir from its version Signed-off-by: Damien Duportal --- provisioning/windows-provision.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1 index 6a1b1e78b..58264617d 100644 --- 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}"; }; }; }