diff options
author | Joni Jäntti <joni.jantti@qt.io> | 2018-09-11 14:21:40 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-12 18:16:02 +0000 |
commit | 974884c0d158732f1dd1870ff027159ace6099ea (patch) | |
tree | 95fc76554289be8836b7c36e8e45a3b5806028c2 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64 | |
parent | 9a7969f76cbcc59c478d41e4b3de3b8e2b8f2cfa (diff) |
Provisioning: Rebase Ubuntu provisioningv5.12.0-alpha1
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 <dominik.holland@pelagicore.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64')
5 files changed, 70 insertions, 0 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 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 index 4527e984..4527e984 100644..100755 --- 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 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 <<EOT >> "$HOME/.ssh/config" +StrictHostKeyChecking=no +Host codereview.qt-project.org + Port 29418 + User qt-builder + IdentityFile "$sshKey" +EOT + |