From 02e4e5a6a0f5b7e97ca3add0d6baba8be2042837 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Wed, 1 Mar 2023 17:11:12 +0100
Subject: [PATCH] [Ubuntu] Do not install erlang on 18.04 (#7212)

* [Ubuntu] Do not install erlang on 18.04

* fixup
---
 .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1   | 2 +-
 images/linux/scripts/tests/Tools.Tests.ps1                      | 2 +-
 images/linux/ubuntu1804.json                                    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index ac7c8daa..7d44e685 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -40,7 +40,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions -
 $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+")
 $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+")
 $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion))
-if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
+if (Test-IsUbuntu20) {
     $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion))
     $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version))
 }
diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1
index b5102b5e..c5eaf479 100644
--- a/images/linux/scripts/tests/Tools.Tests.ps1
+++ b/images/linux/scripts/tests/Tools.Tests.ps1
@@ -132,7 +132,7 @@ Describe "Cmake" {
     }
 }
 
-Describe "erlang" -Skip:(Test-IsUbuntu22) {
+Describe "erlang" -Skip:((Test-IsUbuntu22) -or (Test-IsUbuntu18)) {
     $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} }
 
     It "erlang <ErlangCommand>" -TestCases $testCases {
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index a1001f08..74c4c47d 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -206,7 +206,6 @@
                 "{{template_dir}}/scripts/installers/codeql-bundle.sh",
                 "{{template_dir}}/scripts/installers/containers.sh",
                 "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
-                "{{template_dir}}/scripts/installers/erlang.sh",
                 "{{template_dir}}/scripts/installers/firefox.sh",
                 "{{template_dir}}/scripts/installers/microsoft-edge.sh",
                 "{{template_dir}}/scripts/installers/gcc.sh",