aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-12 12:51:53 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-12 21:13:56 +0100
commitc2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch)
tree35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64
parentab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff)
parent19872ea84352182ee974ff84d2e3872a21427117 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh)11
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh)26
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh)6
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh39
10 files changed, 86 insertions, 23 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh
deleted file mode 100755
index d8874561..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo zypper -nq install python-devel python-virtualenv
-
-# install python3
-sudo zypper -nq install python3 python3-pip python3-virtualenv
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh
deleted file mode 100755
index d10bc06d..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-$(dirname $0)/../common/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
index 4b2f2546..f419b7c1 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
@@ -1,8 +1,10 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
BASEDIR=$(dirname "$0")
source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
@@ -11,3 +13,8 @@ echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | su
echo "Set DISPLAY"
echo 'export DISPLAY=":0"' >> ~/.bashrc
+if [ "$proxy" != "" ]; then
+ sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
+ sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
+fi
+
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
index fb2b81dd..cbdcbf64 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
@@ -1,10 +1,14 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
sudo zypper -nq install git
-# default compiler, gcc 4.8.5
-sudo zypper -nq install gcc
-sudo zypper -nq install gcc-c++
+sudo zypper -nq install gcc7
+sudo zypper -nq install gcc7-c++
+sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
+ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
+ --slave /usr/bin/cc cc /usr/bin/gcc-7 \
+ --slave /usr/bin/c++ c++ /usr/bin/g++-7
sudo zypper -nq install bison
sudo zypper -nq install flex
@@ -16,6 +20,7 @@ sudo zypper -nq install glib2-devel
sudo zypper -nq install libopenssl-devel
sudo zypper -nq install freetype2-devel
sudo zypper -nq install fontconfig-devel
+sudo zypper -nq install sqlite3-devel
# EGL support
sudo zypper -nq install Mesa-libEGL-devel
@@ -46,3 +51,14 @@ sudo zypper -nq install libXrandr-devel
sudo zypper -nq install libXtst-devel
sudo zypper -nq install mozilla-nspr-devel
sudo zypper -nq install mozilla-nss-devel
+
+# qtwebkit
+sudo zypper -nq install libxml2-devel
+sudo zypper -nq install libxslt-devel
+
+# GStreamer (qtwebkit and qtmultimedia)
+sudo zypper -nq install gstreamer-devel
+sudo zypper -nq install gstreamer-plugins-base-devel
+
+# cups
+sudo zypper -nq install cups-devel
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
index abbda212..65d3ad4b 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
@@ -1,9 +1,11 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
-$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
+$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
index a30a3fb4..e7cdd4a7 100644..100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
# provides: python development libraries
# version: provided by default Linux distribution repository
# needed to build pyside
+
+set -ex
+
sudo pkcon -y refresh
sudo pkcon -y install python-devel python-virtualenv
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
new file mode 100755
index 00000000..2044310c
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
index 15b46aef..e5a4208b 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,9 +35,9 @@
# This script install Intel Parallel Studio XE Composer Edition for C++ Linux
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-set -e
+set -ex
mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
localMount="/mnt/storage/"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
index e367c20b..04c09770 100644..100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,4 +33,4 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh
new file mode 100755
index 00000000..5ff78055
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env 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$
+##
+#############################################################################
+
+set -ex
+
+# Having proxy set while running autotests makes them fail
+sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy
+