From 97fd5e03b48a2fcdf278f1ed592e858a71d4e3ab Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Wed, 4 May 2022 13:54:56 +0200
Subject: [PATCH] [Ubuntu] Add python toolcache to 22.04 (#5478)

---
 .../SoftwareReport/SoftwareReport.CachedTools.psm1  |  6 +++---
 images/linux/toolsets/toolset-2204.json             | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
index bb184ba4f..1a5a95ea0 100755
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
@@ -55,10 +55,10 @@ function Build-CachedToolsSection {
     $output += New-MDHeader "PyPy" -Level 4
     $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered
 
-    if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
-        $output += New-MDHeader "Python" -Level 4
-        $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
+    $output += New-MDHeader "Python" -Level 4
+    $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
 
+    if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
         $output += New-MDHeader "Ruby" -Level 4
         $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered
     }
diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json
index c031f5c9e..103d1d088 100644
--- a/images/linux/toolsets/toolset-2204.json
+++ b/images/linux/toolsets/toolset-2204.json
@@ -1,5 +1,18 @@
 {
     "toolcache": [
+        {
+            "name": "Python",
+            "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json",
+            "platform" : "linux",
+            "platform_version": "22.04",
+            "arch": "x64",
+            "versions": [
+                "3.7.*",
+                "3.8.*",
+                "3.9.*",
+                "3.10.*"
+            ]
+        },
         {
             "name": "PyPy",
             "arch": "x64",