From c79d285ffa13590192e7768f7923645c73026a27 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 6 Apr 2018 12:06:20 +0300 Subject: Provisioning: Remove sha1 file after shasum check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index c1e1d6cc..d1f2f1bf 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -56,5 +56,6 @@ function DownloadURL { echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > $targetFile.sha1 sha1sum --check $targetFile.sha1 + rm -f $targetFile.sha1 } -- cgit v1.2.3 From 2e6af2bba76358323d386a8287b9f34b08210347 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 3 Apr 2018 10:28:29 +0300 Subject: Provisioning: Upgrade pip to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Latest pip version is not installed during python installation. Pip need to be reinstalled after python installation because older version of pip seems to cause installation problems randomly at least with python 2.7 Task-number: QTQAINFRA-1902 Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0 Reviewed-by: Alexandru Croitor Reviewed-by: Simo Fält --- coin/provisioning/common/macos/pip.sh | 14 ++++++++++---- coin/provisioning/common/macos/python2.sh | 7 +++++++ coin/provisioning/common/macos/python3.sh | 7 +++++++ coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh | 6 ------ 4 files changed, 24 insertions(+), 10 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh diff --git a/coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/macos/pip.sh index c9af5fbc..2d07db85 100755 --- a/coin/provisioning/common/macos/pip.sh +++ b/coin/provisioning/common/macos/pip.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash -# Will install pip utility for python -curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -sudo python get-pip.py -rm get-pip.py + +function InstallPip { + + python=$1 + + # Will install pip utility for python + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + sudo "$python" get-pip.py + rm get-pip.py +} diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index fbebee42..687b9be5 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -35,8 +35,12 @@ # This script installs python2 +# shellcheck source=./InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +# shellcheck source=./../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +# shellcheck source=./pip.sh +source "${BASH_SOURCE%/*}/pip.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" @@ -45,8 +49,11 @@ DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" +InstallPip python2.7 + /Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" echo "python2 = 2.7.14" >> ~/versions.txt + diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index f38ab5e6..f2876a20 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -36,8 +36,12 @@ # This script installs python3 +# shellcheck source=./InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +# shellcheck source=./../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +# shellcheck source=./pip.sh +source "${BASH_SOURCE%/*}/pip.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" @@ -46,9 +50,12 @@ DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" +InstallPip python3.6 + /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" echo "python3 = 3.6.1" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh deleted file mode 100755 index 69c6b318..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/pip.sh -- cgit v1.2.3 From ba30e967d039a02685d9091556d72776633147cf Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 26 Mar 2018 15:14:58 +0300 Subject: Provisioning: Set ssh key and configurations for Yocto build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1888 Change-Id: I2dd01080998866ce2affd6a5aea797540f28db19 Reviewed-by: Tony Sarajärvi --- .../yocto_ssh_configurations.sh | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh new file mode 100755 index 00000000..7f32e073 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.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 test suite 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 f9e9dd13939f87c4ac1838a4b8d7f03c9100fb5b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 12 Apr 2018 09:51:05 +0300 Subject: Provisioning: Use wayland libs provided by distro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redhat repositories includes needed wayland libraries. Let's use those instead providing those through provisioning. Task-number: QTQAINFRA-1925 Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e Reviewed-by: Johan Helsing Reviewed-by: Simo Fält --- .../04-install-packages.sh | 6 +++ .../qtci-linux-RHEL-7.4-x86_64/60-wayland.sh | 63 ---------------------- .../qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh | 61 --------------------- 3 files changed, 6 insertions(+), 124 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-wayland.sh delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index bf706eb2..754b89d1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -89,6 +89,12 @@ installPackages+=(libxml2-devel) installPackages+=(libxslt-devel) # For building Wayland from source installPackages+=(libffi-devel) +# QtWayland +installPackages+=(mesa-libwayland-egl) +installPackages+=(mesa-libwayland-egl-devel) +installPackages+=(libwayland-client) +installPackages+=(libwayland-cursor) +installPackages+=(libwayland-server) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-wayland.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-wayland.sh deleted file mode 100755 index 01155a46..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-wayland.sh +++ /dev/null @@ -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 - -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -version=1.12.0 -sha1="9a0dd96f53fff3e227035ed76caaa209b632ea8d" -archive="wayland-$version.tar.xz" -primaryUrl="https://wayland.freedesktop.org/releases/$archive" -cacheUrl="http://ci-files01-hki.intra.qt.io/input/wayland/$archive" - -echo "Installing Wayland $version $sha1 on RHEL" - -targetFile="/tmp/$archive" -DownloadURL $primaryUrl $cacheUrl $sha1 $targetFile -tar xf $targetFile --directory /tmp/ -rm $targetFile - -cd /tmp/wayland-$version -./configure \ - --prefix=/usr \ - --libdir=/usr/lib64 \ - --disable-static \ - --disable-documentation -make -sudo make install -rm -rf /tmp/wayland-$version - -echo "wayland = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh deleted file mode 100755 index 7bb6d1e8..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh +++ /dev/null @@ -1,61 +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 - -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -version="17.0.1-6.20170307.wayland" -wayland_egl_rpm="mesa-libwayland-egl-$version.el7.x86_64.rpm" -wayland_egl_sha1="0a42fddd9a58c0bcd93efdaf84fd54b872f050d0" -wayland_egl_devel_rpm="mesa-libwayland-egl-devel-$version.el7.x86_64.rpm" -wayland_egl_devel_sha1="3ece8768e6bdd8603ce15d75f3b80895da038f15" -mirror1="http://ci-files01-hki.intra.qt.io/input/wayland" -mirror2=$mirror1 - -echo "Installing libwayland-egl development packages on RHEL" - -# We're installing the packages with `--nodeps` because we've already installed -# the Wayland libraries, but not through the package manager. - -DownloadURL $mirror1/$wayland_egl_rpm $mirror2/$wayland_egl_rpm $wayland_egl_sha1 /tmp/$wayland_egl_rpm -sudo rpm -i --nodeps /tmp/$wayland_egl_rpm -rm /tmp/$wayland_egl_rpm - -DownloadURL $mirror1/$wayland_egl_devel_rpm $mirror2/$wayland_egl_devel_rpm $wayland_egl_devel_sha1 /tmp/$wayland_egl_devel_rpm -sudo rpm -i --nodeps /tmp/$wayland_egl_devel_rpm -rm /tmp/$wayland_egl_devel_rpm - -echo "mesa-libwayland-egl = $version" >> ~/versions.txt -- cgit v1.2.3 From cfc44559ef5e01103eaca83d68616297e622e006 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 10 Apr 2018 16:04:28 +0300 Subject: Provisioning: Install Git Large File Storage This tool is needed to clone some repositories correctly Task-number: QTQAINFRA-1921 Change-Id: If4744304490649aeecf9daa0c1f840ded9b7beed Reviewed-by: Samuli Piippo --- .../qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh new file mode 100755 index 00000000..b7adce5b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh @@ -0,0 +1,43 @@ +#!/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$ +## +############################################################################# + +# Install Git Large File Storage + +set -ex + +sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F +sudo apt update +sudo apt install git-lfs -- cgit v1.2.3 From 6df84f898459eb18d92c7adeaf8bca1817c2778b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 15 Apr 2018 07:54:22 +0200 Subject: Update submodules on '5.11' in qt5 Change-Id: I5b4c4043f2bfb2bf3e62bc06e244a4fec3e5bbd6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 4f772615..6d73c51d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4f7726155f586ae3aef0b111ae25eacaab91afe9 +Subproject commit 6d73c51d44d10925a05804cd8e70978f155643df diff --git a/qtandroidextras b/qtandroidextras index a2157a9d..b36bf0b3 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a2157a9dd2ee4ed3e998654595544dadaf129fe8 +Subproject commit b36bf0b3eaa026e22a87865e106f54be6b520811 diff --git a/qtbase b/qtbase index 436a6fbb..e8733ffc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 436a6fbb835906e1c62a11dfc7de61461ec767b0 +Subproject commit e8733ffc510cdf3a2e0c21afeeb11535e56d5e2b diff --git a/qtdeclarative b/qtdeclarative index 73a34bf8..19141370 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 73a34bf8319178f2761811240e7c885849f272e9 +Subproject commit 191413704be811c31d5f9d8b5916681ee6c54ddf diff --git a/qtdoc b/qtdoc index ba5445a9..b13e9c4a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ba5445a949facd89472f2a54fb88dc57b118786c +Subproject commit b13e9c4a00d78b79a1ee145a85d017936bc2ccc4 diff --git a/qtimageformats b/qtimageformats index 4e10f354..b83a0a94 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4e10f35483db6d3396fe54dcf3d895d7850f8335 +Subproject commit b83a0a9460432abb82218da247710a1aaf321336 diff --git a/qtlocation b/qtlocation index a4d9f8cb..b21c33a3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a4d9f8cbf2220fbc8aafd8f491313e39e0bf4a5f +Subproject commit b21c33a3278260df469175a3ce08447b7a3dc47c diff --git a/qtmacextras b/qtmacextras index 5f9b1bca..fe8be8f4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5f9b1bca4af0bc7801d513a9424c70b47812cf12 +Subproject commit fe8be8f48cf384a2f1b0f7c03a83aaa81680151b diff --git a/qtmultimedia b/qtmultimedia index c96b95e5..0ec11e33 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c96b95e50e71dfae82de5b822e7ab758787acd47 +Subproject commit 0ec11e3393095dc242030825a6a18dc89e196f99 diff --git a/qtqa b/qtqa index e3754bc5..46daf8aa 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e3754bc547c44aac2713d6245543ee3df484af8f +Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 diff --git a/qtsvg b/qtsvg index 1787f95f..1fd6226d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1787f95f5727a20a4f0871736ad987fcfdf0f3c6 +Subproject commit 1fd6226d52b8d3d201b117902ff1ecd84cc1a1e5 diff --git a/qttools b/qttools index c66dc18b..0c017d45 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c66dc18b37bf50d8b773089d161bccd286d4cd3a +Subproject commit 0c017d45c2ca6279cae418fa951ae2d8a9773020 diff --git a/qttranslations b/qttranslations index 446f2f8e..0bf644a0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 446f2f8e444362b393efe57904e178a20346e88f +Subproject commit 0bf644a075634ca49ee28c0f42566f1012506f31 diff --git a/qtwebengine b/qtwebengine index db7187bb..0841e851 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit db7187bb1420bcbdd933035451895372782ed7e1 +Subproject commit 0841e85172a76766301454fc407fdf0bebf047f4 diff --git a/qtwinextras b/qtwinextras index e484402a..323fdf48 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e484402ad1d9b6d3b89333585b1ead97e4d21635 +Subproject commit 323fdf483f0021b7b3208cf2d35c0cb52248880a -- cgit v1.2.3 From cd347c86afe3307e1b25c0301965099c1c012fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 11 Apr 2018 10:12:09 +0300 Subject: Fix shellcheck complaints in RHEL 6.6 provisioning scripts Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea Reviewed-by: Oswald Buddenhagen Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh | 1 + .../03-install-rhel-epel.sh | 1 + .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 5 +++-- .../qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 +- .../qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh | 1 + .../qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 19 ++++++++++--------- .../qtci-linux-RHEL-6.6-x86_64/99-version.sh | 3 ++- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index fc07e6fa..99612260 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -35,8 +35,10 @@ set -ex +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh index ca31a876..89806892 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh index e31f4869..21a45506 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh @@ -33,6 +33,7 @@ ## ############################################################################# +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" package="epel-release-6-8.noarch.rpm" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index fb5a81b3..7d96209c 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -3,9 +3,10 @@ set -ex BASEDIR=$(dirname "$0") -. $BASEDIR/../common/shared/sw_versions.txt +# shellcheck source=../common/shared/sw_versions.txt +. "$BASEDIR/../common/shared/sw_versions.txt" VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" -$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" +"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index 572ad7ad..74520b6e 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -ex -$(dirname $0)/../common/linux/cmake_linux.sh +"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh index 04c09770..505374c5 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -33,4 +33,5 @@ ## ############################################################################# +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh index e4492eb0..67c17954 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -45,27 +45,28 @@ function Install7ZPackageFromURL { expectedSha1=$2 targetDirectory=$3 - targetFile=`mktemp` - wget --tries=5 --waitretry=5 --output-document=$targetFile $url + targetFile=$(mktemp) + wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" echo "$expectedSha1 $targetFile" | sha1sum --check - sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile - rm $targetFile + sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile" + rm "$targetFile" } echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" -Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64" +Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64" echo "Installing custom ICU devel packages on RHEL" sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" -tempDir=`mktemp -d` +tempDir=$(mktemp -d) +# shellcheck disable=SC2064 trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir -sudo cp -a $tempDir/lib/* /usr/lib64 -sudo cp -a $tempDir/* /usr/ +Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" +sudo cp -a "$tempDir/lib"/* /usr/lib64 +sudo cp -a "$tempDir"/* /usr/ sudo /sbin/ldconfig diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh index 739d06b6..1354bf6b 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -39,9 +39,10 @@ set -ex +# shellcheck disable=SC2129 echo "*********************************************" >> ~/versions.txt echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -$(dirname $0)/../common/linux/version.sh +"$(dirname "$0")/../common/linux/version.sh" -- cgit v1.2.3 From 8375a33d4a6eb2be497a1e320b066ca30fab4be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 11 Apr 2018 15:32:53 +0300 Subject: Fix squish provisioning script typo Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2 Reviewed-by: Oswald Buddenhagen --- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 069d5afd..b160b9ea 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -140,10 +140,10 @@ echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc fi echo "Installing squish license to home directory.." -- cgit v1.2.3 From 081861de184f0e8b5d2b96d3530d048fa49116b8 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Mon, 9 Apr 2018 10:49:55 +0300 Subject: Provisioning: Win10_x86 - Windows 10 SDK with debugging tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA needs debugging tools for Windows 10 x86 testing. Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/win10sdk.ps1 | 50 ++++++++++++++++++++++ .../qtci-windows-10-x86/80-win10sdk.ps1 | 1 + 2 files changed, 51 insertions(+) create mode 100644 coin/provisioning/common/windows/win10sdk.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/80-win10sdk.ps1 diff --git a/coin/provisioning/common/windows/win10sdk.ps1 b/coin/provisioning/common/windows/win10sdk.ps1 new file mode 100644 index 00000000..d33a8fc1 --- /dev/null +++ b/coin/provisioning/common/windows/win10sdk.ps1 @@ -0,0 +1,50 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install Windows 10 SDK + +$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe" +$url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe" +$package = "C:\Windows\Temp\winsdksetup.exe" +$sha1 = "db237323f1779fb143e7cdc558e4345e7004489e" + +Copy-Item $url_cache $package +Verify-Checksum $package $sha1 +Run-Executable $package "/features + /q" + +Write-Host "Cleaning $package.." +Remove-Item -Recurse -Force -Path "$package" + +Write-Output "Windows 10 SDK = 10.0.16229.91" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/80-win10sdk.ps1 b/coin/provisioning/qtci-windows-10-x86/80-win10sdk.ps1 new file mode 100644 index 00000000..3272c306 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/80-win10sdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10sdk.ps1" -- cgit v1.2.3 From c1e2307d02a768b71a8219e07ccddd86ee44411f Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 10 Apr 2018 13:31:41 +0300 Subject: Provisioning: Win10_x86 - psql MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1 new file mode 100644 index 00000000..451d2452 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\postgresql.ps1" -- cgit v1.2.3 From 3d6736a7f110f42935ffbd4e1691b1d3e57f6443 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 10 Apr 2018 13:27:13 +0300 Subject: Provisioning: Win10_x86 - openssl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: I4937980a1f23d56e509b71541605c80cb6423402 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86/09-openssl.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86/09-openssl.ps1 new file mode 100644 index 00000000..d57ad1cd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\openssl.ps1" -- cgit v1.2.3 From c4040976006cd99ae85bcf8bbd19054d00a7b227 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 10 Apr 2018 13:21:47 +0300 Subject: Provisioning: Win10_x86 - mysql MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86/90-mysql.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/90-mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/90-mysql.ps1 b/coin/provisioning/qtci-windows-10-x86/90-mysql.ps1 new file mode 100644 index 00000000..eca19011 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mysql.ps1" -- cgit v1.2.3 From e8a60ed41bb838f40558ac39e496b4a1e32e9140 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Mon, 9 Apr 2018 11:07:08 +0300 Subject: Provisioning: Ubuntu - Add QNX 6.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QNX 6.6.0 is required by RTA. Task-number: QTQAINFRA-1914 Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/qnx_660.sh | 66 ++++++++++++++++++++++ .../qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 38 +++++++++++++ 2 files changed, 104 insertions(+) create mode 100755 coin/provisioning/common/linux/qnx_660.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh new file mode 100755 index 00000000..7f6ab063 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -0,0 +1,66 @@ +#!/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$ +## +############################################################################# + +# This script installs QNX 6.6.0. + +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +targetFolder="/opt/" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz" +sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0" +folderName="qnx660" +targetFile="qnx660.tar.gz" +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" +echo "$sha1 $targetFile" | sha1sum --check +if [ ! -d "$targetFolder" ]; then + mkdir -p $targetFolder +fi +sudo tar -C $targetFolder -xvzf $targetFile +sudo chown -R qt:users "$targetFolder"/"$folderName" + +# Verify that we have last file in tar +if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then + echo "Installation failed!" + exit -1 +fi + +rm -rf $targetFile + +# Set env variables +SetEnvVar "QNX_660" "$targetFolder$folderName" + +echo "QNX SDP = 6.6.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh new file mode 100755 index 00000000..6b5cf23c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -0,0 +1,38 @@ +#!/bin/env bash + +############################################################################# +## +## 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. +## +## $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/linux/qnx_660.sh" -- cgit v1.2.3 From 83f2a25f17020d8ff626ebf961d98e7cdcff5c26 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 14 Feb 2018 15:48:58 +0200 Subject: Provisioning: Add test for squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish is needed by RTA which is not run during normal qt5 build. Other words squish installation is not tested during integration. That's why we need separate test for it. This change will fetch test and run test suite which is made to check that squish installation works Task-number: QTQAINFRA-1733 Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd Reviewed-by: Johanna Äijälä Reviewed-by: Joni Jäntti Reviewed-by: Matti Paaso --- coin/provisioning/common/unix/squishInstall.sh | 14 ++++++++++++ coin/provisioning/common/windows/squishInstall.ps1 | 25 +++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b160b9ea..0ed9b0a0 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -51,6 +51,9 @@ fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" squishLicenseFile=".squish-3-license.tar.gz" +testSuite="suite_test_squish" +testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" + # These checks can be removed when Vanilla OS for all linux and Mac are in if [ -d "$squishFolder" ]; then echo "Move old squish to /tmp" @@ -151,3 +154,14 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" echo "Installing squish $version.." MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" + +echo "Installing test suite for squish" +MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" + +echo "Verifying Squish Installation" +if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then + echo "Squish installation tested successfully" +else + echo "Squish test failed! Package wasn't installed correctly." + exit 1 +fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index fe221890..04eb563b 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -48,6 +48,8 @@ $qtBranch = "59x" $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" +$testSuite = "suite_test_squish" +$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -77,9 +79,13 @@ Function DownloadAndInstallSquish { $squishPackage64bit = "$squishPackage`_64" } Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit + TestSquish $squishPackage64bit } else { if ($squishPackage.StartsWith("mingw")) { Rename-Item $targetDir\$squishPackage $targetDir\mingw + TestSquish mingw + } else { + TestSquish $squishPackage } } } @@ -93,10 +99,27 @@ Function DownloadSquishLicence { Copy-Item $squishUrl\$licensePackage ~\$licensePackage } +Function TestSquish { + Param ( + [string]$squishPackage + ) + + echo "Verifying Squish Installation" + if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") { + echo "Squish installation tested successfully!" + } else { + echo "Squish test failed! $squishPackage wasn't installed correctly." + [Environment]::Exit(1) + } +} Write-Host "Creating $targetDir" New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" +Write-Host "Download and install Test Suite for squish" +Copy-Item $testSuiteUrl $targetDir/$testSuite.7z +Extract-7Zip $targetDir/$testSuite.7z $targetDir + DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { -- cgit v1.2.3 From 6c8307abf6f4683282ea13cb6fb9f9b116d56fbc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 15 Apr 2018 11:29:12 +0200 Subject: Update submodules on '5.11' in qt5 Change-Id: I18750ffb5810a3f60a2b615ca487ce42459d560d Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtscript | 2 +- qttools | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index e8733ffc..8d7edf18 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e8733ffc510cdf3a2e0c21afeeb11535e56d5e2b +Subproject commit 8d7edf18ebd4bb4cf110000afb1b5a8b1f3887a4 diff --git a/qtdeclarative b/qtdeclarative index 19141370..539d7248 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 191413704be811c31d5f9d8b5916681ee6c54ddf +Subproject commit 539d724890aec3f00eadb39aeae973670e664ec6 diff --git a/qtdoc b/qtdoc index b13e9c4a..355f4228 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b13e9c4a00d78b79a1ee145a85d017936bc2ccc4 +Subproject commit 355f4228cfe16204cc9645b6788f9b31aef4cb10 diff --git a/qtscript b/qtscript index 781c7452..c2657d34 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 781c745277f9b4faa87d341b10ec0ca46eb45a73 +Subproject commit c2657d346455a5a7821fbfbe3b1107d7cf9b0949 diff --git a/qttools b/qttools index 0c017d45..1636b5c8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0c017d45c2ca6279cae418fa951ae2d8a9773020 +Subproject commit 1636b5c80b0a4e8de11a1eb537682c0359141eeb diff --git a/qtwebengine b/qtwebengine index 0841e851..a40850f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0841e85172a76766301454fc407fdf0bebf047f4 +Subproject commit a40850f0c165045fd037ff945b00b643031700a9 diff --git a/qtxmlpatterns b/qtxmlpatterns index 3bada53c..e4abf2c6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3bada53c09f226398bcdeddfd633fd6df7c42ff7 +Subproject commit e4abf2c6e3de158d3a6eb3c46b5158f741136c9d -- cgit v1.2.3 From 6a06c4b4fe7fad6595252ac035fc0c05627b62c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 22 Mar 2018 16:04:53 +0200 Subject: Revert "Install Python 2.7.13 to RHEL with pip" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 794913dde77e9a2918353894a33d03b16e6927c4, which seems to break pyside builds. Instead we install python-pip package from the EPEL repository. Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 754b89d1..a0fa62a9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -63,8 +63,8 @@ installPackages+=(gtk3-devel) installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) -# Python 2.7 with python-devel, pip and virtualenv -installPackages+=(python27) +# Python 2 devel and pip. python-pip requires the EPEL repository to be added +installPackages+=(python-devel python-pip) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) # WebEngine @@ -98,8 +98,9 @@ installPackages+=(libwayland-server) sudo yum -y install "${installPackages[@]}" -# Make python 2.7 and its pip default -echo "source scl_source enable python27" >> ~/.bashrc - sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 +# We shouldn't use yum to install virtualenv. The one found from package repo is not +# working, but we can use installed pip +sudo pip install --upgrade pip +sudo pip install virtualenv -- cgit v1.2.3