Commit Graph

476 Commits

Author SHA1 Message Date
Liang Qi
ea28c00dd6 Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
2018-02-15 20:59:29 +01:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
As agreed, this version will not be supported any longer.

Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-02-10 19:15:51 +00:00
Liang Qi
25a0f1fa08 Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
2018-02-07 09:37:28 +01:00
Johan Klokkhammer Helsing
532f1dea57 Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU
Decorations were previously disabled within the Wayland tests to work around
another issue. That issue has now been fixed, and decorations have been enabled
again, but these tests now became flaky when run within QEMU.

Task-number: QTBUG-66173
Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-02-07 04:45:09 +00:00
Liang Qi
3279652635 Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
2018-02-06 17:49:39 +01:00
Liang Qi
0e4931a8af Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
2018-02-04 15:30:50 +01:00
Liang Qi
4cd14f4625 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
2018-02-03 11:08:26 +01:00
Heikki Halmet
4eaa017023 Provisioning: Disable Network Time Protocol
NTP need to be disabled from all tier2 templates

Task-number: QTQAINFRA-1608
Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-02 07:14:40 +00:00
Tony Sarajärvi
7f7c87a15d Remove excess sourcing of try_catch
Change-Id: I3bfa7e8755dbae904719212c22549f6965142330
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-02 07:14:38 +00:00
Joni Jäntti
1583fbd2bb Add Win7_x64 provisioning for RTA purposes
Windows 7 x64 (Windows 7 msvc2013-x86_64) template
is needed since RTA is starting to deploy machines
from coin.

Task-number: QTQAINFRA-1521
Task-number: QTQAINFRA-1615
Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-02-02 07:14:35 +00:00
Maurice Kalinowski
f1422dc64b Provisioning: Switch download sources for mqtt paho broker
Internal resources are preferred and should be used first.

Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:53 +00:00
Maurice Kalinowski
e33f38acef Update MQTT provisioning
Setting an environment variable has been centralized to a separate
script.

Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:49 +00:00
Frederik Gladhorn
eb4fcfaba1 Instead of just warning that apt failed, tell why
With the lsof we should see which process was holding the lock.
After that we can disable this source of problems.

Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-02-01 12:33:16 +00:00
Frederik Gladhorn
282a4f0a35 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
2018-01-31 08:35:46 +01:00
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
2018-01-31 08:32:41 +01:00
Frederik Gladhorn
250e07e99a Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
2018-01-29 14:10:44 +01:00
Frederik Gladhorn
a434f14bd9 Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/common/windows/libclang.ps1

Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
2018-01-29 14:06:05 +01:00
Frederik Gladhorn
485244b016 Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-01-29 13:34:28 +01:00
Heikki Halmet
00e31823d3 Provisioning: Attach subscription to system
Subscriptions need to be reattached when subscriptions have been
renewed by Red Hat.

Directly pushed to get provisioning into working shape.

Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Change-Id: I6e469d7fac3b848193f280702e1e807ce4ea096b
2018-01-29 13:31:17 +01:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Heikki Halmet
462a2aae2b Provisioning: Add Squish provisioning for Release Test Automation
Squish is required by RTA for testing.

Task-number: QTQAINFRA-1523
Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-01-26 13:12:51 +00:00
Heikki Halmet
dc5f851e78 Provisioning: Add common shared folder
Common shared folder includes scripts of files which are common for all
operating system families. Changes under shared folder will trigger
provisioning for all platforms

Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4
Task-number: QTQAINFRA-1451
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:47 +00:00
Tony Sarajärvi
c4cf4fa07f Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:44 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-26 13:12:41 +00:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
2018-01-22 12:19:10 +01:00
Tony Sarajärvi
dc1560dbef Add dependencies needed to build Yocto
Task-number: QTQAINFRA-1690
Change-Id: I9583c39709849d058e6d44473e074e9327907dd8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-19 11:29:58 +00:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
2018-01-19 09:56:46 +01:00
Joni Jantti
786be66eaf Move exception throw to the correct line
This throw was placed on the echo line instead of the actual command.

Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-19 05:25:09 +00:00
Liang Qi
57ba8230bd Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
2018-01-18 23:41:16 +01:00
Oliver Wolff
99595f44f1 Provisioning: Fix disabling windows updates
On some machines the updates were already disabled, which lead
to the call to disable the service failing. Now we just move on without
error.

Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:25 +00:00
Frederik Gladhorn
b86b3a757b Fix provisioning: NotePad++ path on 64 bit windows
We install the 64 bit version of np++ which is installed in the regular
program files folder.

Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-01-18 21:08:21 +00:00
Frederik Gladhorn
b1198d3402 Fix provisioning: Wait for msvc-2013 update 5 to finish
Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)...
Removing C:\Windows\Temp\vs12-kb2829760.exe ...
Caught System.UnauthorizedAccessException
Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied.

Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:19 +00:00
Tony Sarajärvi
7c66e59832 Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-18 16:33:18 +00:00
Tony Sarajärvi
f2f9b14cee Consolidate provisioning script name for qnx in macOS
Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-18 16:33:13 +00:00
Jani Heikkinen
2348ead529 Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"
Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-18 05:09:07 +00:00
Oliver Wolff
e33ef922ba Use "correct" registry when enabling Windows 10 Developer Mode
As coin is running a 32 bit application the registry key ended
up in the Wow6432Node compatibility area of the registry when run
on a 64 bit Windows. Windows does not use this place to check
for the developer mode setting, so we use the "proper" registry
instead.

If adding the registry key fails the script now reflects that
and exits with a proper exit code.

Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-17 16:47:54 +00:00
Frederik Gladhorn
6a875b9f81 Fix checksum for QNX 7 SDK download
Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-17 12:20:52 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 07:31:51 +00:00
Liang Qi
da80efa880 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
2018-01-12 21:14:23 +01:00
Liang Qi
c2d188f225 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
2018-01-12 21:13:56 +01:00
Liang Qi
4175522924 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
2018-01-12 12:06:07 +01:00
Frederik Gladhorn
d8e1574d5f Install p7zip-full, that contains the 7z binary
p7zip is only a minimal version containing 7zr.

Change-Id: I12531514490b6eb871419bdb61ea5896b175a678
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-11 14:20:50 +00:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
2018-01-11 15:13:13 +01:00
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
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
Tony Sarajärvi
1c1557aa93 Provisioning: Set CMake to PATH on Ubuntu
Ubuntu uses .profile file instead of .bashrc. We need to use
the correct file accordingly.

Task-number: QTBUG-65594
(cherry picked from commit 22e4664eb0)
Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-09 19:20:44 +00:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00