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
This commit is contained in:
Liang Qi
2018-08-06 11:31:33 +02:00
9 changed files with 98 additions and 17 deletions

View File

@@ -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