From 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969 Mon Sep 17 00:00:00 2001
From: Juha Karjalainen <juha.karjalainen@qt.io>
Date: Fri, 19 Oct 2018 11:01:36 +0300
Subject: Provisioning: Update openssl to version 1.0.2p
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'coin/provisioning/common/linux')

diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index 353722f2..09d0b6d5 100755
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.0.2o"
+version="1.0.2p"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
 installFolder="/home/qt/"
-sha="a47faaca57b47a0d9d5fb085545857cc92062691"
+sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
 # Until every VM doing Linux Android builds have provisioned the env variable
 # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
 # QTQAINFRA-1436
@@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 
 tar -xzf "$targetFile" -C "$installFolder"
 # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-mv "${opensslHome}o" "${opensslHome}"
+mv "${opensslHome}p" "${opensslHome}"
 pushd "$opensslHome"
 
 echo "Running configure"
-- 
cgit v1.2.3


From 7974f26b20060fe429f8508752c9110cb53703d6 Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Thu, 25 Oct 2018 14:46:04 +0300
Subject: Provisioning: Disable notifications and remove apport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These can cause flakiness during tests

Task-number: QTQAINFRA-2307
Change-Id: Ib8b850e3e1fabe3070bbd27785d043984e085cb7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 coin/provisioning/common/linux/disable-notifications.sh | 4 ++++
 coin/provisioning/common/linux/remove-apport.sh         | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100755 coin/provisioning/common/linux/disable-notifications.sh
 create mode 100755 coin/provisioning/common/linux/remove-apport.sh

(limited to 'coin/provisioning/common/linux')

diff --git a/coin/provisioning/common/linux/disable-notifications.sh b/coin/provisioning/common/linux/disable-notifications.sh
new file mode 100755
index 00000000..7e805833
--- /dev/null
+++ b/coin/provisioning/common/linux/disable-notifications.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false
+sudo gsettings set org.gnome.desktop.notifications show-banners false
diff --git a/coin/provisioning/common/linux/remove-apport.sh b/coin/provisioning/common/linux/remove-apport.sh
new file mode 100755
index 00000000..cb6bddcd
--- /dev/null
+++ b/coin/provisioning/common/linux/remove-apport.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo apt-get purge apport -y
-- 
cgit v1.2.3


From 3ae624cd6e945146d5ca34f02e3b54569a83d7e4 Mon Sep 17 00:00:00 2001
From: Ryan Chu <ryan.chu@qt.io>
Date: Mon, 19 Nov 2018 16:14:23 +0100
Subject: Docker Provisioning: Remove the fixed version of package dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes. Otherwise, all the docker files need to be manually
updated when upgrading to the next Ubuntu version (e.g. 18.04).

For debugging purpose, the installed packaged will be listed in the
provisioning logs.

Change-Id: I38d119d11f33cfd60dc34fcd57ec0fe1615e98f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 coin/provisioning/common/linux/testserver/apache2/Dockerfile  |  3 ++-
 coin/provisioning/common/linux/testserver/danted/Dockerfile   |  3 ++-
 .../provisioning/common/linux/testserver/docker_testserver.sh | 11 +++++++++++
 .../provisioning/common/linux/testserver/ftp-proxy/Dockerfile |  3 ++-
 coin/provisioning/common/linux/testserver/squid/Dockerfile    |  3 ++-
 coin/provisioning/common/linux/testserver/vsftpd/Dockerfile   |  3 ++-
 6 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'coin/provisioning/common/linux')

diff --git a/coin/provisioning/common/linux/testserver/apache2/Dockerfile b/coin/provisioning/common/linux/testserver/apache2/Dockerfile
index bb2dc850..b39eb21e 100644
--- a/coin/provisioning/common/linux/testserver/apache2/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/apache2/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y apache2 libcgi-session-perl wget avahi-daemon
+ARG packages="apache2 libcgi-session-perl wget avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 80 443
 
 # install configurations and test data
diff --git a/coin/provisioning/common/linux/testserver/danted/Dockerfile b/coin/provisioning/common/linux/testserver/danted/Dockerfile
index eb2ac6ff..67c1159b 100644
--- a/coin/provisioning/common/linux/testserver/danted/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/danted/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y gdebi-core=0.9.5.7ubuntu1 wget avahi-daemon
+ARG packages="gdebi-core wget avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb
 RUN gdebi -n dante-server_1.4.1-1_amd64.deb
 EXPOSE 1080-1081
diff --git a/coin/provisioning/common/linux/testserver/docker_testserver.sh b/coin/provisioning/common/linux/testserver/docker_testserver.sh
index a88e89b9..2534c416 100755
--- a/coin/provisioning/common/linux/testserver/docker_testserver.sh
+++ b/coin/provisioning/common/linux/testserver/docker_testserver.sh
@@ -53,6 +53,17 @@ do
     sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \
            sha1sum | awk '{ print $1 }')
     sudo docker build -t qt-test-server-$server:$sha1 $context
+
+    # transition - The fixed tag is temporarily used by CI to pass the qtbase testing.
+    case $server in
+        apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;;
+        squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;;
+        vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;;
+        ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;;
+        danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;;
+    esac
+    [ -z "$fixed_tag" ] || \
+        sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag
 done
 
 sudo docker images
diff --git a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile b/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile
index cecb2dca..c719c1eb 100644
--- a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile
@@ -1,3 +1,4 @@
 FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y ftp-proxy=1.9.2.4-10 avahi-daemon
+ARG packages="ftp-proxy avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 2121
diff --git a/coin/provisioning/common/linux/testserver/squid/Dockerfile b/coin/provisioning/common/linux/testserver/squid/Dockerfile
index 0b930bca..f0ed68b3 100644
--- a/coin/provisioning/common/linux/testserver/squid/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/squid/Dockerfile
@@ -1,3 +1,4 @@
 FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y squid=3.5.12-1ubuntu7.5 avahi-daemon
+ARG packages="squid avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 3128-3130
diff --git a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile b/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile
index f8e32d40..af6cd7c7 100644
--- a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile
+++ b/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y vsftpd=3.0.3-3ubuntu2 ftp=0.17-33 wget avahi-daemon
+ARG packages="vsftpd ftp wget avahi-daemon"
+RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
 EXPOSE 20-21
 
 # install configurations and test data
-- 
cgit v1.2.3


From cbdd122e18a067a4564791786c4bb2a7c0d67350 Mon Sep 17 00:00:00 2001
From: Juha Karjalainen <juha.karjalainen@qt.io>
Date: Fri, 30 Nov 2018 16:17:07 +0200
Subject: Provisioning: Update install android sdk to version 28

QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.

Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 coin/provisioning/common/linux/android_linux.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'coin/provisioning/common/linux')

diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 8ff773a3..c77af943 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -54,7 +54,7 @@ toolsFile="sdk-tools-linux-4333796.zip"
 ndkVersion="r18b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
-sdkApiLevel="android-21"
+sdkApiLevel="android-28"
 
 toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
 ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
@@ -80,14 +80,14 @@ else
     sudo chown -R qt:users "$targetFolder"
 fi
 
-echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 # shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
     proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
     proxy_port=$(echo "$proxy" | cut -d':' -f3)
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 else
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 fi
 
 echo "Checking the contents of Android SDK..."
-- 
cgit v1.2.3