diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-06 11:31:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-06 11:31:33 +0200 |
| commit | d746bc3ea8297e22ec609a80a77a9596b5ce1471 (patch) | |
| tree | 5cde1556e817efbd3aa93cac0b36b71edea7bcc5 /coin/provisioning/common | |
| parent | a43a23f7d17c6d3450bcce40409887e57df485e7 (diff) | |
| parent | 00730d1caf7c5fb2e4eb914985c41e9221a03708 (diff) | |
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
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/mqtt_broker.ps1 | 8 |
2 files changed, 6 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 |