From 569fd1dabc47dccd80331d4f380eae811fd07447 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 11 Nov 2019 14:24:36 +0200 Subject: Provisioning: Install pre-builded openssl for Windows 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f90938c4..269771c7 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,10 +43,10 @@ # nmake install -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" -$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" +$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip Verify-Checksum $zip $sha1 @@ -55,6 +55,8 @@ $installFolder = "C:\openssl" Extract-7Zip $zip "C:\" Remove-Item -Path $zip +Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl + Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" -- cgit v1.2.3 From 6cc2215b8ce6da477cf23f01ff5b88c0d12c2b88 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:09:12 +0100 Subject: DownloadURL last argument (targetFile) is now optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index ac1fd971..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 -- cgit v1.2.3 From fafd3d655d4ebb303825cb40203ecf39f3b0e578 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 15:37:32 +0100 Subject: Fix cache URL for telegraf windows package Fixes: QTQAINFRA-3340 Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install_telegraf.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 index 258c6c59..fee550b1 100644 --- a/coin/provisioning/common/windows/install_telegraf.ps1 +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -49,7 +49,7 @@ if (Is64BitWinHost) { $filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename $url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename $tempfile = "C:\Windows\Temp\" + $filename -- cgit v1.2.3 From a270bcdb6beb34d7590378899805391cfcfe7091 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:45:45 +0100 Subject: Docker installation: do not depend on external repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 37 ++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'coin') 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 -- cgit v1.2.3 From 33d254781788ae145075da53534741587be036a5 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 17:30:46 +0100 Subject: Keep debug trace off to avoid polluting the logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 127239d1..08303700 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -ex +set -e . $(dirname "$0")/../../common/unix/DownloadURL.sh -- cgit v1.2.3 From ef7481b9cd514d0e3d73c5211193d1d100acfe74 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 13 Nov 2019 19:55:51 +0100 Subject: Workaround broken local apt mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'coin') 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 e7cf5c3d..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,6 +46,10 @@ 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/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse -- cgit v1.2.3