Commit Graph

2203 Commits

Author SHA1 Message Date
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
351a519340 Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
2018-01-29 13:44:48 +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
Oswald Buddenhagen
3504be0d83 Adjust submodule branches
Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39
2018-01-26 16:00:53 +01: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
Qt Submodule Update Bot
7681e742d7 Update submodules on '5.9' in qt5
Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 13:12:39 +00:00
Liang Qi
3c3d56c0cc Update submodules on '5.10' in qt5
Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 07:54:42 +00:00
Qt Submodule Update Bot
352b30a15d Update submodules on '5.10' in qt5
Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 08:55:01 +00:00
Qt Submodule Update Bot
e32dd4fe58 Update submodules on '5.10' in qt5
Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 07:58:13 +00:00
Qt Submodule Update Bot
b6a1e9f07e Update submodules on '5.10' in qt5
Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-21 07:36:34 +00:00
Qt Submodule Update Bot
09ec294210 Update submodules on '5.9' in qt5
Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-20 14:27:18 +00:00
Qt Submodule Update Bot
5f57762934 Update submodules on '5.10' in qt5
Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-20 14:19:44 +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
Qt Submodule Update Bot
31a0826fe8 Update submodules on '5.9' in qt5
Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:25:02 +00:00
Qt Submodule Update Bot
21e7344389 Update submodules on '5.10' in qt5
Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:24:06 +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
Qt Submodule Update Bot
b22fccf5ba Update submodules on '5.10' in qt5
Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 05:14:41 +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>
v5.9.4
2018-01-18 05:09:07 +00:00
Qt Submodule Update Bot
8aec4db6a6 Update submodules on '5.9.4' in qt5
Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-18 05:09:01 +00:00
Qt Submodule Update Bot
b55370e356 Update submodules on '5.10' in qt5
Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 13:14:49 +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
Qt Submodule Update Bot
d1aeb5c569 Update submodules on '5.9' in qt5
Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 12:15:25 +00:00
Qt Submodule Update Bot
5ee73db243 Update submodules on '5.10' in qt5
Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-16 08:01:20 +00:00
Qt Submodule Update Bot
113ad91c98 Update submodules on '5.9.4' in qt5
Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-14 17:28:22 +00:00
Qt Submodule Update Bot
1540a87590 Update submodules on '5.9' in qt5
Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 15:41:12 +00: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
Qt Submodule Update Bot
fb1c052f3b Update submodules on '5.9' in qt5
Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 20:01:11 +00: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
Qt Submodule Update Bot
271fedaf88 Update submodules on '5.10' in qt5
Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-11 06:42:49 +00:00
Qt Submodule Update Bot
3e96fec2e1 Update submodules on '5.9' in qt5
Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 05:22:31 +00: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
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
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
Qt Submodule Update Bot
5f022e5785 Update submodules on '5.9.4' in qt5
Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-09 19:20:30 +00:00
Qt Submodule Update Bot
a8e3c392b2 Update submodules on '5.10' in qt5
Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-09 10:57:05 +00:00
Tony Sarajärvi
2fe8d370e6 Add +x rights to provisioning scrips missing it and consolidate shebang
Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:39 +00:00
Tony Sarajärvi
22e4664eb0 Fix opcua provisioning by sourcing .profile
When CMake is installed it exports its install
path into .profile. However, freeopcua doesn't source
it as builds do, so it couldn't find the cmake.
Also, as Ubuntu is using .profile in our builds,
this commit fixes so that the PATH is actually written
into the right file.

Task-number: QTBUG-65594
Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:37 +00:00
Tony Sarajärvi
84899eca4c Consolidate prefixes of provisioning scripts
Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-07 15:20:34 +00:00