diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-07 12:49:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-07 12:49:55 +0200 |
commit | 9bfa486dd097723bd2fc0d8d85ebfb8dca6bbe12 (patch) | |
tree | 06bd66879c1cee90b31e42e855ed5e1744c290fe /coin/provisioning | |
parent | 4e8b5bae5b14fad8e5498d37ec8c6682ee8702b1 (diff) | |
parent | 7b9c3ced842644736da18859b7c0d78182901f23 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
coin/platform_configs/default.txt
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
Diffstat (limited to 'coin/provisioning')
4 files changed, 20 insertions, 60 deletions
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 d4f136a6..2c46e703 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 @@ -44,6 +44,19 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai sudo systemctl stop $service sudo systemctl disable $service done + +function set_internal_repo { + 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 +EOC +} + +(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." + # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging installPackages+=(git) @@ -150,12 +163,12 @@ installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) -echo "Installing packages" -waitLoop -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" echo "Running update for apt" waitLoop sudo apt-get update +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 6f926777..ce8043fa 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -87,3 +87,5 @@ sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resourc echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh deleted file mode 100755 index 38fb6103..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/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$ -## -############################################################################# - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index 4737b8e9..d91316bd 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -87,3 +87,5 @@ sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resourc echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT |