From 5a54cdbbf1c1b48cfe1f538fe5550efffbda6226 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Thu, 9 May 2024 20:59:58 +0200
Subject: [PATCH] [Ubuntu] Add Python to the Ubuntu 24.04 toolcache (#9820)

---
 images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +---
 images/ubuntu/toolsets/toolset-2404.json                   | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
index 46fb0d95e..3f323df48 100644
--- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
+++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -263,9 +263,7 @@ if (-not $(Test-IsUbuntu24)) {
 $cachedTools = $installedSoftware.AddHeader("Cached Tools")
 $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+")
 $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+")
-if (-not $(Test-IsUbuntu24)) {
-    $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+")
-}
+$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+")
 $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+")
 if (-not $(Test-IsUbuntu24)) {
     $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+")
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
index d8aff8629..2ca767397 100644
--- a/images/ubuntu/toolsets/toolset-2404.json
+++ b/images/ubuntu/toolsets/toolset-2404.json
@@ -6,7 +6,12 @@
             "platform" : "linux",
             "platform_version": "24.04",
             "arch": "x64",
-            "versions": []
+            "versions": [
+                "3.9.*",
+                "3.10.*",
+                "3.11.*",
+                "3.12.*"
+            ]
         },
         {
             "name": "PyPy",