Revert "[Ubuntu] install gcc@11 from brew (#6202)" (#6232)

This reverts commit d2c84c9d4c.

images/linux/scripts/tests/Tools.Tests.ps1

@@ -257,22 +257,16 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) {
 }
 
 Describe "Homebrew" {
-    $brewToolset = (Get-ToolsetContent).brew
-    $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} }
-
     It "homebrew" {
         "brew --version" | Should -ReturnZeroExitCode
     }
 
-    It "zstd has /usr/local/bin symlink" {
+    Context "Packages" {
-        "/usr/local/bin/zstd" | Should -Exist
+        $testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } }
-    }
 
-    It "homebrew package <brewName>" -TestCases $testCases {
+        It "<ToolName>" -TestCases $testCases {
-        $brewPrefix = brew --prefix $brewName
+           "$ToolName --version" | Should -Not -BeNullOrEmpty
-        $brewPackage = Join-Path $brewPrefix "bin" $brewCommand
+        }
-
-        "$brewPackage --version" | Should -ReturnZeroExitCode
     }
 }
 

images/linux/toolsets/toolset-1804.json

@@ -217,14 +217,7 @@
         ]
     },
     "brew": [
-        {
+        {"name": "zstd"}
-            "name": "gcc@11",
-            "command": "gcc-11"
-        },
-        {
-            "name": "zstd",
-            "command": "zstd"
-        }
     ],
     "docker": {
         "images": [

images/linux/toolsets/toolset-2004.json

@@ -217,14 +217,7 @@
         ]
     },
     "brew": [
-        {
+        {"name": "zstd"}
-            "name": "gcc@11",
-            "command": "gcc-11"
-        },
-        {
-            "name": "zstd",
-            "command": "zstd"
-        }
     ],
     "docker": {
         "images": [

images/linux/toolsets/toolset-2204.json

@@ -201,10 +201,7 @@
         ]
     },
     "brew": [
-        {
+        {"name": "zstd"}
-            "name": "zstd",
-            "command": "zstd"
-        }
     ],
     "docker": {
         "images": [