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

 Conflicts:
	coin/provisioning/common/unix/mqtt_broker.sh

Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2

6 files changed, 7 insertions, 5 deletions

diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh
index c6a65305..37732b31 100644
--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -40,7 +40,7 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
 SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
 targetFolder="/opt/paho_broker"
diff --git a/coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/windows/jom.ps1
index 21993184..7cb60229 100644
--- a/coin/provisioning/common/windows/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
@@ -3,7 +3,7 @@
 $version = "1_1_2"
 $zip = Get-DownloadLocation "jom_$version.zip"
 
-Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
+Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.intra.qt.io/input/windows/jom_$version.zip $zip
 Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
 Extract-7Zip $zip C:\Utils\Jom
 
diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1
index 301667b4..7c13cfb7 100644
--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -38,7 +38,7 @@ $zip = Get-DownloadLocation "pahotest.zip"
 $commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
 $sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
 
-$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
 $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"
 
 Download $externalUrl $internalUrl $zip
diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1
index 1629e676..90d214cb 100644
--- a/coin/provisioning/common/windows/vulkansdk.ps1
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -36,7 +36,7 @@
 # This script will install Vulkan SDK
 
 $version = "1.0.51.0"
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
 
 Copy-Item $url_cache $vulkanPackage
diff --git a/coin/provisioning/common/windows/win10sdk.ps1 b/coin/provisioning/common/windows/win10sdk.ps1
index d33a8fc1..3d5b84ef 100644
--- a/coin/provisioning/common/windows/win10sdk.ps1
+++ b/coin/provisioning/common/windows/win10sdk.ps1
@@ -35,7 +35,7 @@
 
 # This script will install Windows 10 SDK
 
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winsdksetup.exe"
 $url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
 $package = "C:\Windows\Temp\winsdksetup.exe"
 $sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
index 99612260..0b85f10d 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -42,3 +42,5 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 if [ "$http_proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
+
+sudo yum update -y nss curl