From d038865e6523b91d8159436adf665eb17ecaea94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 4 Sep 2018 12:19:13 +0300 Subject: Fix license text of provisioning script Change-Id: I542da038dd087b1705d1ceb475a1656eeec84c91 Reviewed-by: Maurice Kalinowski Reviewed-by: Liang Qi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh index 97b546f2..4527e984 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage -- cgit v1.2.3 From d038ea67576833a5096efbe8a868b574283df5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 5 Sep 2018 12:55:55 +0300 Subject: Provision GCC 8.2 to Ubuntu 18.04 and set as default compiler The provisioning scripts supports prebuilt binaries. When available, those are extracted taken into use. If they are not found, sources are downloaded and built. Task-number: QTQAINFRA-2066 Change-Id: Id1a59be2d1cbdb29d316ade572c3ce8f17ad3a6b Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh new file mode 100755 index 00000000..62940e21 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/linux/gcc.sh +source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" + +InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400 + -- cgit v1.2.3 From 974884c0d158732f1dd1870ff027159ace6099ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 11 Sep 2018 14:21:40 +0300 Subject: Provisioning: Rebase Ubuntu provisioning Some provisioning changes made to Ubuntu 16.04 didn't make it to 18.04 when the new platform was introduced. These changes need to be included. Task-number: QTQAINFRA-2210 Change-Id: Ie8c3cfda95abadbd3a416545ebcfbbab8c0cb4ad Reviewed-by: Dominik Holland Reviewed-by: Liang Qi --- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 7 +++ .../22-mqtt_broker.sh | 0 .../qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 4 ++ .../qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 4 ++ .../yocto_ssh_configurations.sh | 55 ++++++++++++++++++++++ 5 files changed, 70 insertions(+) mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') 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 ff2f1dac..92b7a990 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 @@ -96,6 +96,7 @@ installPackages+=(g++-multilib) installPackages+=(python3-dev) installPackages+=(python3-pip) installPackages+=(python3-virtualenv) +installPackages+=(python3-wheel) # python2 development package installPackages+=(python-dev) # Automates interactive applications (Needed by RTA to automate configure testing) @@ -150,3 +151,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]} echo "Running update for apt" waitLoop sudo apt-get update + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh new file mode 100755 index 00000000..4a6681f3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/linux/docker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh new file mode 100644 index 00000000..b062800a --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/linux/ubuntu-version.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh new file mode 100755 index 00000000..e4d988fc --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa" +sha1="1b0d651661c33a654ac89ef3c97bbe06d6bf1ca1" +sshKey="$HOME/.ssh/test_farm_id_rsa" + +DownloadURL "$url" "$url" "$sha1" "$sshKey" +chmod 600 "$sshKey" + +echo "Configuring ssh config file for Yocto" +cat <> "$HOME/.ssh/config" +StrictHostKeyChecking=no +Host codereview.qt-project.org + Port 29418 + User qt-builder + IdentityFile "$sshKey" +EOT + -- cgit v1.2.3 From c51c0a2b2e3cd68af2c44216bfb0df2c7adc754c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 11 Sep 2018 12:48:26 +0300 Subject: Fix shebang on QNX provisioning scripts for Ubuntu 18.04 Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 6b5cf23c..1a185223 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh index 7f24d224..24ac2ac0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## -- cgit v1.2.3