[Ubuntu] Remove php installation, tests and software docs for Ubuntu …

…16 (actions#3541) * Remove php installation, tests and software docs for Ubuntu 16 * Add openssl 1.1.1k installation as python toolcache depends on it * Add a comment about openssl installation on Ubuntu 16
dmitry-shibanov · Jun 10, 2021 · 4416d54 · 4416d54
1 parent 6c587eb
commit 4416d54
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -185,7 +185,9 @@ if (Test-IsUbuntu20) {
     $markdown += New-MDNewLine
 }
 
-$markdown += Build-PHPSection
+if (-not (Test-IsUbuntu16)) {
+    $markdown += Build-PHPSection
+}
 
 $markdown += New-MDHeader "Haskell" -Level 3
 $markdown += New-MDList -Style Unordered -Lines (@(

diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh
@@ -4,6 +4,7 @@
 ##  Desc:  Installs basic command line utilities and dev packages
 ################################################################################
 source $HELPER_SCRIPTS/install.sh
+source $HELPER_SCRIPTS/os.sh
 
 common_packages=$(get_toolset_value .apt.common_packages[])
 cmd_packages=$(get_toolset_value .apt.cmd_packages[])
@@ -12,4 +13,19 @@ for package in $common_packages $cmd_packages; do
     apt-get install -y --no-install-recommends $package
 done
 
+# Toolcache Python requires updated libssl-dev, which was previously installed from ppa:ondrej.
+# The ppa dropped Ubuntu 16 support hence we need to build OpenSSL from source
+if isUbuntu16; then
+    openSslArchiveName="openssl-1.1.1k.tar.gz"
+    openSslUrl="https://www.openssl.org/source/${openSslArchiveName}"
+    download_with_retries $openSslUrl "/tmp"
+    openSslPath="/tmp/$(basename -s .tar.gz $openSslArchiveName)"
+    mkdir -p "$openSslPath"
+    tar -C "$openSslPath" -xzf "/tmp/${openSslArchiveName}" --strip-components=1 && cd $openSslPath
+    ./config --openssldir=/etc/ssl '-Wl,--enable-new-dtags,-rpath,$(LIBRPATH)'
+    make -s
+    make install > /dev/null
+    ln -sf /etc/ssl/bin/openssl /usr/bin/openssl
+fi
+
 invoke_tests "Apt"
diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1
@@ -1,4 +1,4 @@
-Describe "PHP" {
+Describe "PHP" -Skip:(Test-IsUbuntu16) {
 
     [array]$testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{phpVersion = $_} }
 

diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
@@ -253,17 +253,6 @@
             "gfortran-9"
         ]
     },
-    "php": {
-        "versions": [
-            "5.6",
-            "7.0",
-            "7.1",
-            "7.2",
-            "7.3",
-            "7.4",
-            "8.0"
-        ]
-    },
     "rubygems": [],
     "node_modules": [
         {

diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
@@ -227,7 +227,6 @@
                 "{{template_dir}}/scripts/installers/bazel.sh",
                 "{{template_dir}}/scripts/installers/oras-cli.sh",
                 "{{template_dir}}/scripts/installers/phantomjs.sh",
-                "{{template_dir}}/scripts/installers/php.sh",
                 "{{template_dir}}/scripts/installers/postgresql.sh",
                 "{{template_dir}}/scripts/installers/pulumi.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",