mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-31 18:57:05 +08:00
Provisioning: Remove docker from macOS provisioning
When docker provisioning starting test-server in virtual box whole virtual machine will reboot. Let's remove docker until it's more stable or we know how to fix it. Task-number: QTQAINFRA-2801 Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e (cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a) Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
This commit is contained in:
Heikki Halmet
committed by
Tony Sarajärvi
Tony Sarajärvi
parent
06fb909429
commit
d5c96aad5a
@@ -1,63 +0,0 @@
|
||||
#!/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
|
||||
|
||||
# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine).
|
||||
url="https://download.docker.com/mac/stable/DockerToolbox.pkg"
|
||||
target_file="DockerToolbox.pkg"
|
||||
|
||||
if [ -x "$(command -v sha1sum)" ]
|
||||
then
|
||||
# This part shall be used in CI environment only. The DownloadURL script needs sha1sum
|
||||
# which is not included in the default macOS system. In addition, the cached pkg can't
|
||||
# be downloaded out of the Qt internal network.
|
||||
case ${BASH_SOURCE[0]} in
|
||||
*/macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;;
|
||||
*/*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;;
|
||||
*) UNIX_PATH="../unix" ;;
|
||||
esac
|
||||
|
||||
source "$UNIX_PATH/DownloadURL.sh"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg"
|
||||
sha1="7196d2d30648d486978d29adb5837ff7876517c1"
|
||||
DownloadURL $url_cached $url $sha1 $target_file
|
||||
else
|
||||
curl $url -o $target_file
|
||||
fi
|
||||
sudo installer -pkg $target_file -target /
|
||||
|
||||
# Start testserver provisioning
|
||||
source "${BASH_SOURCE%/*}/docker_testserver.sh"
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/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
|
||||
|
||||
case ${BASH_SOURCE[0]} in
|
||||
*/macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;;
|
||||
*/*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;;
|
||||
*) SERVER_PATH="../shared/testserver" ;;
|
||||
esac
|
||||
|
||||
# testserver shared scripts
|
||||
source "$SERVER_PATH/testserver_util.sh"
|
||||
|
||||
# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support
|
||||
cpu_features=$(sysctl -a | grep machdep.cpu.features)
|
||||
case $cpu_features in
|
||||
*VMX*) ;;
|
||||
*) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;;
|
||||
esac
|
||||
|
||||
# Create docker virtual machine (Boot2docker)
|
||||
source "$SERVER_PATH/docker_machine.sh"
|
||||
|
||||
# Using SHA-1 of each server context as the tag of docker images. A tag labels a
|
||||
# specific image version. It is used by docker compose file (docker-compose.yml)
|
||||
# to launch the corresponding docker containers. If one of the server contexts
|
||||
# (./apache2, ./danted, ...) gets changes, all the related compose files in
|
||||
# qtbase should be updated as well.
|
||||
|
||||
source "$SERVER_PATH/settings.sh"
|
||||
|
||||
for server in $testserver
|
||||
do
|
||||
context="$SERVER_PATH/$server"
|
||||
docker build -t qt-test-server-$server:$(sha1tree $context) $context
|
||||
done
|
||||
|
||||
docker images
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/docker.sh
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/docker.sh
|
||||
Reference in New Issue
Block a user