From baa46f9590929bdd53a47648c943f56622bedf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 15 Sep 2017 16:06:28 +0300 Subject: [PATCH 1/4] Provisioning: fix .ci.local addresses to .intra.qt.io Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906 Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2015_update.ps1 | 2 +- coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 | 2 +- coin/provisioning/common/3dstudio_3rdparty.ps1 | 2 +- coin/provisioning/common/ninja.ps1 | 2 +- coin/provisioning/common/python3.ps1 | 4 ++-- coin/provisioning/common/python3.sh | 2 +- coin/provisioning/common/ruby.ps1 | 2 +- coin/provisioning/common/vc_redist.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh | 2 +- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 index 556a352f..0c00ba71 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -36,7 +36,7 @@ # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 $version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" $sha1 = "a31e099e5114fef80a21654689e6864afc544a16" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index fb6a6594..2ad479c8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB $msvc_web_installer = "vs" + $version + "_" + $update_version $package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index 01442324..cf00ee88 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -36,7 +36,7 @@ # This script will install Visual Studio 2017 $version = "2017" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 index 556a352f..0c00ba71 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 @@ -36,7 +36,7 @@ # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 $version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" $sha1 = "a31e099e5114fef80a21654689e6864afc544a16" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index fb6a6594..2ad479c8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB $msvc_web_installer = "vs" + $version + "_" + $update_version $package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index 01442324..cf00ee88 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -36,7 +36,7 @@ # This script will install Visual Studio 2017 $version = "2017" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" $msvcPackage = "C:\Windows\Temp\$version.exe" diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/3dstudio_3rdparty.ps1 index 36816438..f9c8faa7 100644 --- a/coin/provisioning/common/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/3dstudio_3rdparty.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty Remove-Item $zip diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/ninja.ps1 index 0d21f799..08bf2579 100644 --- a/coin/provisioning/common/ninja.ps1 +++ b/coin/provisioning/common/ninja.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip" -Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.ci.local\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip +Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2" Extract-Zip $zip C:\Utils\Ninja diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1 index 3c565874..316b567a 100644 --- a/coin/provisioning/common/python3.ps1 +++ b/coin/provisioning/common/python3.ps1 @@ -46,12 +46,12 @@ $install_path = "C:\Python36" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" } diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh index 56e82386..31591339 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/python3.sh @@ -38,7 +38,7 @@ source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" DestDir="/" diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 index 343bacfc..f7813c20 100644 --- a/coin/provisioning/common/ruby.ps1 +++ b/coin/provisioning/common/ruby.ps1 @@ -2,6 +2,6 @@ $installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" -Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer +Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" & $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 index 4213dde9..4a8376b6 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/vc_redist.ps1 @@ -43,13 +43,13 @@ if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $arch = "x64" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x64.exe" $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" } else { $arch = "x86" $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x86.exe" $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1" } diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh index eca6858c..ef676ab3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/XZ.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" DestDir="/" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh index a9776ba6..743cc9da 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh @@ -49,7 +49,7 @@ ExceptionRemoveTmpFile=106 ExceptionDisableAutoUpdate=107 -url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg +url=http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg targetFile=/tmp/jdk-8u102-macosx-x64.dmg expectedSha1=1405af955f14e32aae187b5754a716307db22104 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index ea8613ad..6d57bfaa 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh index 54389916..ca21f481 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" appPrefix="" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh index e699933d..cb5c1852 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh @@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" psqlVersion="9.6.0" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" appPrefix="" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index 49ea0754..16b2f0c4 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" -basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" +basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-macosx.zip" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index a6563ae5..d109051d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.ci.local/input/openssl/$opensslFile" +opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh index dcd8fead..8a3999b9 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" DestDir="/" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 7555c752..37acc2ee 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -50,4 +50,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh index 4d938890..1e4de16a 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" appPrefix="" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh index 381fedf2..a990829e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -40,7 +40,7 @@ # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" appPrefix="" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index cc00fe0d..3ffe1a06 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -37,7 +37,7 @@ $zip = "c:\users\qt\downloads\qnx700.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb" Extract-7Zip $zip C:\ From 634d19610967feae48e410a04b2ecd1598f30572 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 1 Nov 2017 13:01:39 +0200 Subject: [PATCH 2/4] Provisioning: Refresh Subscription-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subscription manager needs to be refreshed so that RedHat repositories will stay available for provisioning scripts Change-Id: Idebc994fbefde951000570f6690c6849abfd3666 Reviewed-by: Tony Sarajärvi --- .../001-refresh-subscription-manager.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh new file mode 100755 index 00000000..a76a8638 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# refresh local certificates +sudo subscription-manager refresh + From 03d6b7b36a95fe171ab6e873a5b1d1e1629a2977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 1 Nov 2017 09:32:50 +0200 Subject: [PATCH 3/4] Fix Windows 8 libclang script locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently for some reason there exist both "windows-8" and "windows-8.1" folders in coin/provisioning/. "windows-8" folders contain only the libclang provisioning scripts. These should be under "windows-8.1" since "windows-8" shouldn't exist anymore. Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267 Reviewed-by: Heikki Halmet Reviewed-by: Simo Fält --- .../{qtci-windows-8-x86 => qtci-windows-8.1-x86}/08-libclang.ps1 | 0 .../08-libclang.ps1 | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/{qtci-windows-8-x86 => qtci-windows-8.1-x86}/08-libclang.ps1 (100%) rename coin/provisioning/{qtci-windows-8-x86_64 => qtci-windows-8.1-x86_64}/08-libclang.ps1 (100%) diff --git a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 From 6275ed9d70b840bb945e58338398c0c48f57d08c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 31 Oct 2017 10:17:49 +0200 Subject: [PATCH 4/4] Provisioning: Fix p7zip installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c Reviewed-by: Tony Sarajärvi Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh index d21fab6c..966f3045 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh @@ -32,11 +32,24 @@ ## $QT_END_LICENSE$ ## ############################################################################# +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -sudo wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm -sudo rpm -ivh epel-release-7-10.noarch.rpm -sudo yum -y install p7zip -sudo rm epel-release-7-10.noarch.rpm +name="p7zip" +version="7-11" +package="epel-release-$version.noarch.rpm" +primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" +cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" +sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +targetFile="/tmp/$package" + +DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" + +sudo rpm -ivh "$targetFile" +sudo yum -y install "$name" +sudo rm "$targetFile" # Link 7za to 7z so we can use existing installation scripts sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt +