Commit Graph

595 Commits

Author SHA1 Message Date
Liang Qi
0a2465bc30 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
2018-05-30 21:19:11 +02:00
Oliver Wolff
e57ef7c949 Update winrtrunner
A newer build of winrtrunner is needed. It is built from dev and
contains fixes related to handling of test output (most
importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d).

To make the script more stable, the newer version of winrtrunner
was also copied to ci-files01, so that an alternative download
location can be offered.

Change-Id: I6a429aa3292266067756ce7ba3553088dc168197
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-05-28 11:38:29 +00:00
Maurice Kalinowski
b317ad8096 Remove hardcoded download path
Previously all files got downloaded to a hardcoded path, including the
username for the CI machines. Usually, it does not fit the username of a
local development machine, complicating to reproduce bugs.

Introduce Get-(Default)DownloadLocation functions in helpers to
specify the default download location. This helps to run the
provisioning scripts on a local machine.

Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-05-25 10:25:55 +00:00
Maurice Kalinowski
45709cec07 Provisioning: Update Open62541
Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-25 07:32:00 +00:00
Maurice Kalinowski
d9fcbde41d Provisioning: Install Open62541 on Windows
Open62541 is one of the supported OPC UA backends in the Qt OpcUa
module.

Change-Id: I9baaffbae058d0590819e248694ee41887558708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-05-25 06:45:00 +00:00
Liang Qi
a2b5c37d7a Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
2018-05-18 11:55:23 +02:00
Simon Hausmann
d75411d6e5 Fix linking of qdoc against an external libclang (part 1)
This is the qt5 part of the fix for the task. For the special version of
libclang we hacked together that allows static linkage, set an
environment variable that the mighty qdoc build system can utilize to
activate the release packaging specific linkage.

Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9
Task-number: QTBUG-68178
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-05-14 12:30:59 +00:00
Liang Qi
b1f1bf5560 Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
2018-05-09 22:12:22 +02:00
Tony Sarajärvi
80b8954591 Update openssl packages to 1.0.2o
Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:49 +00:00
Tony Sarajärvi
b1c3eeb213 Fix styles in setting proxy
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:44 +00:00
Tony Sarajärvi
c7562fa8ef Take proxy into use in python provisioning in windows
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:40 +00:00
Simon Hausmann
41369b6282 Install the MinGW build of libclang
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.

Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-05-01 06:34:05 +00:00
Oliver Wolff
8d04f876e7 windows provisioning: Do not use Windows builtin way of extracting zips
The builtin way of Windows for handling zip files is much slower than
using 7zip. A small benchmark (not representative, just extracting the
android ndk) showed 11 minutes using Extract-Zip vs 2,5 minutes using
Extract-7Zip on my machine.

Change-Id: I5198aabb5b75860ead687581fc5e368eb75e48ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-29 13:21:05 +00:00
Heikki Halmet
e3699c5a6f Add missing sw versions to versions.txt
Change-Id: Ifa12b6c6308e4ad73989e7e935061f77ae1823e2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:21:01 +00:00
Tony Sarajärvi
d93baa38d0 Fix powershell stylings in provisioning scripts
Change-Id: I946027047b9810ec1197b50394f157eb406434c2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-04-29 13:20:48 +00:00
Tony Sarajärvi
cd87f148dd Fix Squish Provisioning coding style
Change-Id: I663ce38fffa3a9446972d1790d80f76b7155c029
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:44 +00:00
Tony Sarajärvi
b8c0fb552f Fix and-or in NTP disabling
Change-Id: Ib4b6ffa65ba600919ad71b2748da5055449f3164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-29 13:20:40 +00:00
Tony Sarajärvi
eccb53c607 Fix shellcheck complaints in common macos provisioning scripts
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:32 +00:00
Tony Sarajärvi
9bf79e6bab Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:29 +00:00
Jędrzej Nowacki
c5ddbdb86b Update clang version to 6.0
The version also contains statically compiled libraries so we can
ship qdoc without shipping libclang.

The change temporarly removes CI qdoc builds from RHEL6 and MinGW,
these two configurations are not used for packaging, just for CI
testing. We should restore MinGW later.

Task-number: QTBUG-66015
Task-number: QTBUG-67764
Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-28 11:59:06 +00:00
Heikki Halmet
83f2a25f17 Provisioning: Add test for squish installation
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ä <johanna.aijala@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-15 16:41:18 +00:00
Joni Jantti
e8a60ed41b Provisioning: Ubuntu - Add QNX 6.6.0
QNX 6.6.0 is required by RTA.

Task-number: QTQAINFRA-1914
Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:13 +00:00
Joni Jantti
081861de18 Provisioning: Win10_x86 - Windows 10 SDK with debugging tools
RTA needs debugging tools for Windows 10 x86 testing.

Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:40:57 +00:00
Tony Sarajärvi
8375a33d4a Fix squish provisioning script typo
Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-15 16:40:53 +00:00
Heikki Halmet
2e6af2bba7 Provisioning: Upgrade pip to latest version
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 <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:35 +00:00
Heikki Halmet
c79d285ffa Provisioning: Remove sha1 file after shasum check
Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:32 +00:00
Oliver Wolff
0029642f18 Fix msvc_2015_update3_patch
Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-04-06 19:41:22 +00:00
Frederik Gladhorn
a01e7f3d40 Install an android virtual device for testing
The goal is to run tests on the AVD eventually.

Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-03-26 09:18:48 +00:00
Frederik Gladhorn
8552003532 Reduce wget verbosity when downloading qnx
The default style gives 1 KiB dots, 50 KiB per line, and the file is
567 MiB (~11600 lines). Reduce it to 1 MiB per dot and 32 MiB per line
(~18 lines).

Change-Id: Id181eee63313a4ad486af6c4752de0ed9ed5f7b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-03-26 09:18:45 +00:00
Heikki Halmet
8197e80155 Provisioning: Remove Java update from windows startup items
Change-Id: Iec709c9c42840910ab0dd98634c200d2aba8f7bf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:45 +00:00
Joni Jantti
5085220907 Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12
This package is required by RTA.

Task-number: QTQAINFRA-1878
Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:39 +00:00
Tony Sarajärvi
de4e9c2169 Provisioning: refactor squish install
Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-22 06:05:36 +00:00
Tony Sarajärvi
ab021d4bb4 Make unzip less verbose in macOS
Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-22 06:05:30 +00:00
Heikki Halmet
a6feaec287 Provisioning: Fix java installation for mac
Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:09 +00:00
Tony Sarajärvi
1b5f8cec03 Remove try_catch.sh helper script
Change-Id: I3981920bb8085ffbad89c31e0fd628a6e11146b6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:06 +00:00
Tony Sarajärvi
a98b0f3d79 Remove try_catch codes from common macOS scripts
Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:00 +00:00
Tony Sarajärvi
90261c1df5 Remove try_catch codes from unix scripts
Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:58 +00:00
Tony Sarajärvi
1c6abfae01 Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:53 +00:00
Joni Jantti
5d7972b73b Provisioning: Windows - Disable autoreboot
Windows machines currently reboot automatically in case of a blue
screen crash. This must be disabled to prevent problems with Coin.

Task-number: QTQAINFRA-1748
Change-Id: I64ac1cfa124694fab356b8443298c1b37bed9a92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-18 16:22:17 +00:00
Tony Sarajärvi
eebc0133f0 Disable update download in background
Task-number: QTQAINFRA-1852
Change-Id: I6d8e433fa40dd080fe84efcf3d0c655d14f86010
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:07 +00:00
Heikki Halmet
23b4bcf6c5 Provisioning: Move http_proxy.txt under shared folder
Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-15 15:07:27 +00:00
Heikki Halmet
237b308d47 Provisioning: Fix adb process name for android sdk installation
There's no process called "adb.exe" - It's called "adb"

Change-Id: I3c23ede12a6d7fc7f3f33bbb806a84e8d9a2aaf4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-15 15:07:24 +00:00
Jędrzej Nowacki
8a47814c91 Simplify DownloadURL
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e to a sourcing
script which was propagating through DownloadURL.sh to almost all
provisioning scripts. So it is good to avoid using it.

Change-Id: If191a0dcf52a29c4bec580a254e8e58a00130f6d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-14 05:12:41 +00:00
Rainer Keller
04d1ee1df4 Provisioning: Create symbolic for shasum tool on macOS for compatibility
On macOS the sha1 tool is named 'shasum' while on all other unix systems
it is called 'sha1sum'. In order to make all unix provisioning scripts
run on macOS without special case handling a symbolic link is created.

Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:34 +00:00
Joni Jantti
940ef0a4cc Provisioning: win8.1 - RTA required provisioning scripts
Currently Windows 8.1 platforms have been removed from CI. RTA
however still uses them for testing so we need to add the programs
that RTA uses.

Task-number: QTQAINFRA-1524
Change-Id: Ide9fa076dc965b16b96f610541ace6088543f795
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:18 +00:00
Heikki Halmet
3410bab278 Provisioning: Fix Squish installation for msvc14 32-bit
Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-03-08 19:27:14 +00:00
Joni Jantti
95609c6657 Provisioning: Executequeueditems on Windows
mscorsvw.exe background processing is draining a lot of
CPU processing on Windows platforms. Executing the list
of to be processed items with full CPU capacity should
clear out the list and stop the background processing.

Task-number: QTQAINFRA-1775
Change-Id: Ib12bc10f4572390f20bfea915ca48ec398de46ee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-08 19:27:11 +00:00
Maurice Kalinowski
7a052f4183 open62541: Fix provisioning for RHEL 7.4
RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.

Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-03-08 19:27:06 +00:00
Jędrzej Nowacki
bb9739773c Simplify openssl_for_android_linux provisioning script
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e So it is good
to avoid using it.

Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-06 06:41:46 +00:00
Jani Heikkinen
52b163092a Add missing 08-libclang.ps1 for windows7 provisioning
We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was
missing from windows7.

Task-number: QTBUG-65950
Change-Id: I7f75eb0181056a2117080ead6dc5862324906689
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-01 07:17:27 +00:00