Commit Graph

334 Commits

Author SHA1 Message Date
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Tony Sarajärvi
f84bab04f7 Remove unneeded provisioning scripts
Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-13 22:14:52 +00:00
Konstantin Tokarev
c016a01b4c Conan: fix names of ICU dll's which are added to qtwebkit binary package
Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:56 +00:00
Joni Jäntti
841cf6893a Make QtWebKit builds use vanilla Win 10 x64 template
QtWebKit build targets are currently using the old non-vanilla template
for Windows 10 x64.

Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:52 +00:00
Heikki Halmet
6309243064 Provisioning: Install expect
Expect is needed by Release Test Automation (RTA) to automate
configure testing.

Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:49 +00:00
Tony Sarajärvi
d56552566f Provisioning: FBX SDK
We need to provision the FBX SDK for Qt3DStudio.

Task-number: QTQAINFRA-1449
Change-Id: I52587cd653b7954340d5f58978ffbd008330337c
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:46 +00:00
Jan Arve Sæther
3653630d22 Provisioning: Disable NTP synchronization for Windows
During CI, it has been observed that some processes didn't leave their
wait state. (So they were "hanging")
During analysis of the event log on that CI node, we found out that at the
same time those processes entered this state, the NTP client set a new time
and indeed the local time of the CI node changed (it was
changed 2 hours forward in our case).
For the record, the processes we observed this with was jom.exe and
cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)).

We therefore have a strong suspicion that the NTP time change was causing
the CI hang, so we simply disable it.
The virtual machine should anyway get the correct time from its VM host
when its started.

Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-11-10 23:29:49 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00
Heikki Halmet
60fb3cb272 Provisioning: Install signing tools to MacOS
Install needed certificates and signing tools which are
needed when signing release packages

Change-Id: I21b9c3d1a6b4c83dec6b8ae1674def4ecc02f444
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:52 +00:00
Heikki Halmet
ada909932d Provisioning: Update Java to version 8
Current version of Java isn't installing correctly during provisioning.
Silent installation needs parameters which are added to script. Without
those the installation process tries to open Java3BillDevices.jpg
unsuccessfully and the installation fails

Task-number: QTQAINFRA-1498
Task-number: QTQAINFRA-1394
Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:43 +00:00
Joni Jäntti
537ea17d14 Fix Ubuntu 16.04 random provisioning fail
Ubuntu 16.04 provisioning sometimes fails in the apt-get commands for
package installations. This is caused by a lock that is still in use
when the system is calling the apt-get commands.

This change will use the apt daemon to queue the install commands
and wait for the lock to release instead of checking once and then
failing if the lock is not open.

Task-number: QTQAINFRA-1502
Change-Id: Idd4aff42f99cf4d14c08aef8fcc3cb7dbc58b2dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-08 11:50:25 +00:00
Heikki Halmet
0e278c4e95 Provisioning: Remove logical OR when echo errors
set -e won't work if logical OR is used after commands. These error
echo's need to be removed so that error catch will works. Also set -ex
added to print executed command when error caught.

Task-number: QTQAINFRA-1533
Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-07 15:25:12 +00:00
Tony Sarajärvi
894c63834b Fix spelling of ANDROID_SDK_HOME
It was incorrectly created at ANDROID_SDK_ROOT,
but Coin doesn't use that env variable. It uses _HOME.

Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-07 15:25:04 +00:00
Joni Jäntti
e3deccd936 Yocto toolchain provisioning to CI
Provisioning scripts need to install Yocto toolchains (32 and 64 bit)
so that the artifacts aren't needed to be unzipped during Qt builds.

Task-number: QTQAINFRA-1454
Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-06 07:56:18 +00:00
Heikki Halmet
6275ed9d70 Provisioning: Fix p7zip installation
Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:41 +00:00
Joni Jäntti
03d6b7b36a Fix Windows 8 libclang script locations
Currently for some reason there exist both "windows-8" and
"windows-8.1" folders in coin/provisioning/. "windows-8" folders
contain only the libclang provisioning scripts. These should be under
"windows-8.1" since "windows-8" shouldn't exist anymore.

Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:38 +00:00
Heikki Halmet
634d196109 Provisioning: Refresh Subscription-manager
Subscription manager needs to be refreshed so that RedHat repositories
will stay available for provisioning scripts

Change-Id: Idebc994fbefde951000570f6690c6849abfd3666
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-03 07:15:36 +00:00
Tony Sarajärvi
baa46f9590 Provisioning: fix .ci.local addresses to .intra.qt.io
Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-03 07:15:33 +00:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
Tony Sarajärvi
583e196784 Cleanup of opengl32.dll replacement
This one isn't needed as the vanilla OS already contains
the original file.

Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:44 +00:00
Tony Sarajärvi
185eb5b414 Cleanup of provisioning scripts as tier1 images are vanilla
Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:41 +00:00
Jani Heikkinen
72cc047726 Fix QNX platform configurations for Qt 5.9
With Qt 5.9 series we still deliver binaries for QNX 6.6 only ->
  - Add QNX 6.6 platform configurations for windows
  - Remove 'packaging' flag from QNX 7.0 builds
  - Add provisioning script to patch QNX in windows 10 as well

This change fixes the previous 5.6 merge, where this should've happened.

Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-27 03:18:00 +00:00
Tony Sarajärvi
372d2bb076 Provision vanilla Windows 7 x86 and use it
Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-24 12:53:26 +00:00
Joni Jäntti
3b7b924b31 Fix Windows 10 x64 Python with new tier 1
Current tier 1 template #9 has python and anaconda installed that came
with MSVC2017. This messes with the provisioning scripts and ultimately
builds such as pyside, even though qt5 builds go through.

Task-number: QTQAINFRA-1503
Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-23 17:37:10 +00:00
Allan Sandfeld Jensen
f129af9f81 Add mozilla-nss-devel to opensuse
QtWebEngine now depends hard on NSS as the OpenSSL backend never worked
well on Linux.

Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-22 12:17:33 +00:00
Tony Sarajärvi
5f76910476 Provision ICC to openSUSE 42.3
Task-number: QTQAINFRA-1196
Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-19 09:28:47 +00:00
Joni Jäntti
357202801f Make CI use a new RHEL 7.4 provisioning
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5.

This commit replaces RHEL 7.2 in desktop builds, android builds
and INTEGRITY builds.

Task-number: QTQAINFRA-1251
Task-number: QTQAINFRA-1252
Task-number: QTQAINFRA-1253
Task-number: QTQAINFRA-1267
Task-number: QTQAINFRA-1269
Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-19 09:28:44 +00:00
Tony Sarajärvi
128075f744 Fix typo in echoing version to versions.txt
Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:17 +00:00
Joni Jäntti
4cdfd8e902 Make 7zip provisioning script add 7zip to path
7zip is nice to have in path for future purposes such as when
cherry-picking to other branches where we use different
extracts scripts.

Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:15 +00:00
Joni Jäntti
e8fc216658 Make Extract-7zip helper function work with the new provision location
Changed the helper function for extracting 7z files so that it also
supports the new C:\Utils\sevenzip location.

Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-17 16:57:12 +00:00
Joni Jäntti
e09dc71d25 Make Ninja provisioning use Add-Path function
We should use this helper function now that we have it.

Change-Id: I9a522533795d4d4e63f608a0624378f066055b10
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:09 +00:00
Joni Jäntti
a26ce5e56a Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 10 template.

Task-number: QTQAINFRA-1263
Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:07 +00:00
Tony Sarajärvi
2a650c49ee Provisioning: Fix usage of DownloadURL to throw errors
In case DownloadURL failed it's shasum check, it printed an error
and threw an exit 1. This exit 1 was never handled in the calling
scripts and went ignored. It was also not passed forward as
it was inside a try-catch statement.

Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-30 12:21:16 +00:00
Tony Sarajärvi
cda49ad060 Remove duplicate MinGW 5.3 provisioning
Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-30 12:21:01 +00:00
Tony Sarajärvi
8a93a8fe6a Provisioning: cleanup path from cmake_linux.sh
Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-30 12:20:39 +00:00
Liang Qi
1cfc052b9d Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Joni Jäntti
0e4d668e35 Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.

Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-27 06:04:11 +00:00
Simo Fält
0b251bbdc0 Provisioning: Install Python3 development libs to OpenSUSE
Those are required to build Pyside#5.9 branch.

Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-26 07:30:25 +00:00
Heikki Halmet
512f8ff0a2 Change Packaging and iOS builds to macOS 10.12
This changes swap packaging and iOS builds
from 10.10 to 10.12

Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-25 09:10:31 +00:00
Liang Qi
892b1977c5 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Maurice Kalinowski
b77ab20bf0 Provisioning: Update MQTT provisioning
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.

Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-23 05:48:44 +00:00
Liang Qi
04ccf0e8db Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
2017-09-22 21:15:52 +02:00
Joni Jäntti
0c66e761be provisioning: Windows 10 x64/x86 Vulkan SDK
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.

Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-09-19 06:39:31 +00:00
Simon Hausmann
356b20feed Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Liang Qi
e7472f4308 Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
	.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
2017-09-18 09:42:25 +02:00
Simon Hausmann
57043fb07b Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.

Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-16 05:35:10 +00:00
Simon Hausmann
b7d9431716 Fix python installation on OpenSuSE 42.3
The move was forgotten in commit
dd3d32d13c that merged the 42.1 to 42.3
switch from the 5.9 branch.

Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-16 05:17:48 +00:00
Heikki Halmet
12fd0d5b9b Ensure 'clean' android Installation
Remove old android installation and make sure new 'clean' android
folder is created.

Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-15 10:38:24 +00:00
Maurice Kalinowski
fd76acc661 Add mqtt to qtci-linux-openSUSE-42.3-x86_64
MQTT provisioning happened concurrently with an OpenSUSE update.

Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-14 15:04:30 +00:00
Tony Sarajärvi
b0a9259c6e Provision and build QNX660 on Win 10 x64
Changes the mingw from 4.9 to 5.3.

Task-number: QTQAINFRA-1208
Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:39 +00:00