Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef

4 files changed, 16 insertions, 6 deletions

diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh
index 0f3e32aa..2d79c77b 100644
--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-CommitSHA="ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
+CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
 PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="ba2b7d05afe4e13446d40cd4e753dda7f325a587"
+SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"
 
diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1
index 7cb8dd7c..f362f55c 100644
--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -35,11 +35,11 @@
 
 Write-Host "MQTT: Downloading Paho test broker..."
 $zip = Get-DownloadLocation "pahotest.zip"
-$commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25"
-$sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587"
+$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
+$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"
 
-$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
-$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
+$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
+$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
 
 Download $externalUrl $internalUrl $zip
 Verify-Checksum $zip $sha1
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index 6527625e..444765bf 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -35,6 +35,9 @@
 
 set -ex
 
+# Remove update notifications and packagekit running in the background
+sudo yum -y remove PackageKit gnome-software
+
 installPackages=()
 installPackages+=(git)
 installPackages+=(zlib-devel)
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
index aff325bb..53e551cc 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -169,3 +169,10 @@ pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+
+sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe
+deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse
+EOC