Commit Graph

2021 Commits

Author SHA1 Message Date
Konstantin Tokarev
ebe2b86fd0 Remove 'Packaging' flag from QtWebKit MSVC2017/x86
Qt doesn't provide binaries for this platform.

Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-10 10:35:59 +00:00
Qt Submodule Update Bot
123ff665c3 Update submodules on '5.9' in qt5
Change-Id: I46157aa3edab44a436fbf9a02e6213f5c2a00f85
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-10 10:35:54 +00:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-01-10 07:58:26 +00:00
Joni Jantti
52da24b78e Remove devtoolset sourcing from openssl provisioning on Ubuntu
This line is a leftover from RHEL script and needs to be removed on
Ubuntu.

Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-10 07:58:22 +00:00
Qt Submodule Update Bot
65c714aaab Update submodules on '5.9' in qt5
Change-Id: I4901819f1c7141d151b287e945c1e0afa0ca5b16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 08:38:48 +00:00
Qt Submodule Update Bot
f71d4a3b97 Update submodules on '5.9' in qt5
Change-Id: I54bae68afc005a9e5d8d29e0766504d83d983e13
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-06 17:09:34 +00:00
Liang Qi
89d4dec818 Merge remote-tracking branch 'origin/5.9.4' into 5.9
Conflicts:
	.gitmodules

Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
2018-01-05 22:58:09 +01:00
Liang Qi
b9b259fd40 Update submodules on '5.9' in qt5
Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-05 20:05:41 +00:00
Joni Jantti
82a6a9347f Provisioning: Ubuntu 16.04 - Set timezone to UTC
Task-number: QTBUG-65435
Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-05 20:05:38 +00:00
Joni Jantti
a742af96fb Provisioning: Ubuntu16.04 - CMake
CMake is missing from the clean installed Ubuntu 16.04.

Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 12:30:25 +00:00
Jani Heikkinen
18f6169bee Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'

Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
2018-01-05 07:47:26 +02:00
Tony Sarajärvi
4fb893fcf8 Set up proxy for provisioning scripts
Task-number: QTQAINFRA-1669
Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:35 +00:00
Tony Sarajärvi
b9aae857f9 Fix shebangs and give provisioning scripts +x rights
Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:29 +00:00
Tony Sarajärvi
6eee3f6cff Add set -ex to 7z provisioning in RHEL 7.4
Change-Id: If6323055999830954df6893d72ff2031b34f0276
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:43 +00:00
Tony Sarajärvi
da3d21c0e6 Fix the Tier1 image that qtbase builds qemu builds with
Commit fcc0feaacb forgot to
update the Tier1 image in qtbase.txt. It only updated
default.txt and qtdeclarative.txt. Most likely because
qtbase.txt was added after initial changes were made
and not caught in rebase.

Task-number: QTQAINFRA-1574
Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:38 +00:00
Qt Submodule Update Bot
497fc75f1a Update submodules on '5.9' in qt5
Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:45 +00:00
Joni Jantti
19f8a741f3 Make provisioning script prefix style match across platforms
Currently we are using different styles and amount of digits for the
provisioning script prefixes. This change will unify them across the
platforms. Also removes a couple of duplicate files.

Task-number: QTQAINFRA-1668
Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-29 13:16:40 +00:00
Joni Jantti
d6f7d6ed8b Provisioning: VirtualBox for RTA
RTA needs VirtualBox for running GammaRayPlugin RTA tests.

Task-number: QTQAINFRA-1661
Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:36 +00:00
Joni Jäntti
fcc0feaacb Add clean Ubuntu 16.04 provisioning
Currently Ubuntu 16.04 template has stuff installed on its tier 1. We
want to have a clean installed tier 1 and install everything on it
during provisioning. This will save some disk space on our hosts.

Task-number: QTQAINFRA-1574
Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:32 +00:00
Joni Jantti
d29192ad3f Add set -ex to provisioning scripts for openSUSE-42.3
Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:40 +00:00
Joni Jantti
ca89bec297 Add set -ex to provisioning scripts for RHEL 6.6
Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:33 +00:00
Joni Jantti
66595488f0 Add set -ex to provisioning scripts for Ubuntu-16.04
Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:29 +00:00
Joni Jantti
28bf922739 Add set -ex to provisioning scripts for macos-10.12
Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:25 +00:00
Joni Jantti
cec7c07283 Add set -ex to provisioning scripts for osx-10.10
Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:21 +00:00
Joni Jantti
b23faee265 Add set -ex to provisioning scripts for osx-10.11
Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:17 +00:00
Tony Sarajärvi
70d3800aab Remove provisioning of ICU for VS2012
Visual Studio 2012 isn't used in our builds.

Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:13 +00:00
Tony Sarajärvi
fb282b2e58 Provision fbx to RHEL 7.4 for 3DStudio
Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:08 +00:00
Tony Sarajärvi
1399d6e130 Add set -ex to provisioning scripts for RHEL 7.4
Task-number: QTQAINFRA-1659
Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:03 +00:00
Qt Submodule Update Bot
2d71b84893 Update submodules on '5.9' in qt5
Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-24 00:57:34 +00:00
Simo Fält
de0d7005cc Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5df4ec2ec9)
2017-12-22 15:22:27 +00:00
Oswald Buddenhagen
a0bf828433 Adjust submodule branches
Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
2017-12-22 12:57:22 +01:00
Tony Sarajärvi
88a1c161e5 Remove unneeded OS X provisioning scripts
Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-22 05:21:27 +00:00
Jani Heikkinen
21cbacf4b4 Remove 'Packaging' flag from builds we don't need it
We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit
so we don't need 'packaging' flag there either

Task-number: QTBUG-65324
Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-22 05:21:20 +00:00
Qt Submodule Update Bot
dd7f4112fd Update submodules on '5.9' in qt5
Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-22 05:21:14 +00:00
Simon Hausmann
d55baf5baf Simplify apt package installation and disable daily package maintenance
Instead of using aptdcon, we can continue to use apt-get to install the
software. We just need to make sure that the automatic update and
package upgrade services are disabled. This is generally desirable as we
do not want these kind of activities to occur in the background while
building or running tests.

This also fixes the broken package installation via regex, which apt-get
supports but aptdcon does not.

Revert "Fix Ubuntu 16.04 random provisioning fail"

This reverts commit 537ea17d14.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-12-20 06:38:30 +00:00
Qt Submodule Update Bot
41edaa5fb9 Update submodules on '5.9' in qt5
Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:26 +00:00
Albert Astals Cid
04f8860d8c Install cups-devel in OpenSuse
This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch

Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-18 10:58:10 +00:00
Qt Submodule Update Bot
0ae61f0f4d Update submodules on '5.9' in qt5
Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-18 05:26:11 +00:00
Heikki Halmet
b16eac13e6 Provisioning: Remove Android script from Red Hat 6.6
Android linux builds are run by Red Hat 7.4

Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:39 +00:00
Jani Heikkinen
b0b6b05b34 Add 'ForceDebugInfo' -flag to linux desktop binaries
Add 'ForceDebugInfo' for RHEL 7.4 as well

Task-number: QTBUG-3934
Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-12-13 19:41:28 +00:00
Joni Jantti
1dee4e9fca Fix broken and duplicate Ruby provisioning
Ruby is being installed twice on certain Windows platforms and the 32
bit versions of these don't have a working PATH addition.

Task-number: QTQAINFRA-1632
Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:24 +00:00
Qt Submodule Update Bot
0565e759c5 Update submodules on '5.9' in qt5
Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-13 19:41:24 +00:00
Heikki Halmet
d06d1081c0 Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit adcdf7b49f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 06:02:54 +00:00
Liang Qi
c98db75188 Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: I01a6ee1ecfaabe56e585194ccfab3b25fbd89e8b
2017-12-11 12:31:12 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Qt Submodule Update Bot
e067ea2a72 Update submodules on '5.9' in qt5
Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-11 05:46:41 +00:00
Allan Sandfeld Jensen
35db81f33e Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry-picked from 9a9d798ce4)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-12-10 12:56:35 +00:00
Joni Jantti
828f82b6f0 Add missing name prefixes for Win7 provision scripts
The prefix numbers were missing for Ruby and QNX patch scripts.

Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:26 +00:00
Tony Sarajärvi
74dd14ae83 Remove provisioning scripts from non existing platform
Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-09 18:48:21 +00:00
Joni Jäntti
77fdde0de9 RHEL7.4: install packages in one yum instance
Currently we are opening and closing a yum instance for every package
we install during provisioning. This is a bit inefficient so it's
better to install them in one go.

Task-number: QTQAINFRA-1586
Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:15 +00:00