diff options
| -rwxr-xr-x | coin/provisioning/common/linux/docker.sh | 37 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/remove-update_notifier.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/install-commandlinetools.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/DownloadURL.sh | 13 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 13 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh | 2 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtremoteobjects | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtvirtualkeyboard | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebsockets | 0 |
21 files changed, 50 insertions, 21 deletions
diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 1d9e8419..127239d1 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -35,18 +35,37 @@ set -ex -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y + +. $(dirname "$0")/../../common/unix/DownloadURL.sh + + +localRepo=http://ci-files01-hki.intra.qt.io/input/docker +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 + +echo ' + f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb + ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb + 09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb +' \ + | xargs -n2 | while read sha f +do + DownloadURL $localRepo/$f $upstreamRepo/$f $sha +done + +sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb + sudo usermod -a -G docker $USER sudo docker info -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + $localRepo/$f \ + https://github.com/docker/compose/releases/download/1.24.1/$f \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +rm ./docker-compose* # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y diff --git a/coin/provisioning/common/linux/remove-update_notifier.sh b/coin/provisioning/common/linux/remove-update_notifier.sh index 152d7fa8..4ee32d61 100755 --- a/coin/provisioning/common/linux/remove-update_notifier.sh +++ b/coin/provisioning/common/linux/remove-update_notifier.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -sudo apt -q -y remove update-notifier update-manager +sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh index b9f81534..cd7838b6 100755 --- a/coin/provisioning/common/macos/install-commandlinetools.sh +++ b/coin/provisioning/common/macos/install-commandlinetools.sh @@ -50,7 +50,7 @@ function InstallCommandLineTools { hdiutil attach "/tmp/$packageName" cd "/Volumes/Command Line Developer Tools" echo "Installing" - sudo installer -pkg ./*.pkg -target / + sudo installer -pkg ./*.pkg -target / -allowUntrusted cd / # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted sleep 3 diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 0579451f..5bafc33d 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -89,7 +89,14 @@ DownloadURL () { url=$1 url2=$2 expectedHash=$3 - targetFile=$4 + # Optional argument $4: destination filename + if [ x"$4" = x ] + then + # defaults to the last component of $url + targetFile=$(echo $url | sed 's|^.*/||') + else + targetFile=$4 + fi if VerifyHash "$targetFile" "$expectedHash" then @@ -99,9 +106,9 @@ DownloadURL () { if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! Download "$url" "$targetFile" + if ! Download "$url2" "$targetFile" then - echo 'FAIL! to download even from alternative url' 1>&2 + echo 'FAIL! to download even from alternative URL' 1>&2 return 1 fi fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 280e6b45..89b1eb7f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -46,12 +46,15 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + 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/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse EOC } diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh index 1ab68fec..510ce59b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1_updated.tar.gz 10.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index ebeadc02..2ee4dedf 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 diff --git a/qt3d b/qt3d -Subproject 84fe56e60ee0668290911fa017fd58ffb9e4cd3 +Subproject 93361f1a59c1edd2e4eb6d2aa7e2da5b73760a1 diff --git a/qtbase b/qtbase -Subproject d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830 +Subproject a7a24784eeba6747d319eb911583bdd99ef38cd diff --git a/qtconnectivity b/qtconnectivity -Subproject 85145c9f7afdbcda54bc8ba9762c5a3ce0ff42f +Subproject 13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a diff --git a/qtdeclarative b/qtdeclarative -Subproject 0ee5414e58c9c48401bb0361657dd9d252cb6ad +Subproject 4080025fed9d43a78b578bcab67397712459d28 diff --git a/qtimageformats b/qtimageformats -Subproject 606ae7e0197f3bcff442c2df3beb918952d8e82 +Subproject 9fe1f2e918d39031852805f1add23125c061d3c diff --git a/qtqa b/qtqa -Subproject 3f42e54db5e4780e37381e00598a69d93dfc9c0 +Subproject 97a4384354b00a1c0baa00414916fae23f53e09 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 43a843142f0dfc43089594caaa2d5174498ffd9 +Subproject 9a5e84b8f9ca0eeda8170eb93c093f3ab25de98 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 73e620404968c8b0c126db925687f8275793391 +Subproject 44d51ea7b45b2dce1b6772217269a4d1dff88a8 diff --git a/qtsensors b/qtsensors -Subproject 151c71a860f69698e7470e3b997e48dcc937600 +Subproject e032fe21b6d8d2c92e93ab0ba7a367be23db82b diff --git a/qtserialbus b/qtserialbus -Subproject ed16064dc4ff340a27ee971f1f0276fe1bdfd40 +Subproject 9c498a990646f6d51b461a246b7cce477423721 diff --git a/qtserialport b/qtserialport -Subproject 3f48932a92301ea4a5dbce536a7d9dcc17f467c +Subproject 2216279ffd43fb84042da2faa5bc432770351ec diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject b11fb9ecacb3b2196e9568272c6e5489dfb5dda +Subproject 8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb diff --git a/qtwebengine b/qtwebengine -Subproject 4a141b148d04be3b97d29d2ef808c30c2e8f54b +Subproject 556576b55f6b4404c71c74a5ef8e21f87ed0985 diff --git a/qtwebsockets b/qtwebsockets -Subproject 07f8e5dae95ae78c200817cd73e612bdb4659d2 +Subproject a8bbc056335719830a6b2746b7a85cfa2fd8916 |