Commit Graph

230 Commits

Author SHA1 Message Date
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba Update freeopcua version
And also moved to Ubuntu 16.04 as we're not testing 14 anymore.

Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 07:45:00 +00:00
Simon Hausmann
f56f2c20c4 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt

This also reverts c9d5341307 as on macOS
10.11 in 5.9 we're using a fresh virtual machine template that doesn't
have stale virtualenv/python installations.

Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
2017-07-19 13:24:43 +02:00
Simo Fält
c9d5341307 Provisioning: Fix virtualenv in macOS 10.11
There are multiple Python installations in our macOS 10.11 Tier1
template. Most of them are pretty old and not even working properly.
One of the affected Python tool is virtualenv, which atm is creating
Python 2.6 env by default even if Python 2.7 is the default Python.

Change-Id: I8bc0900976a9dc79637539802345175c85b7b433
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-19 05:54:01 +00:00
Jędrzej Nowacki
eca392d3f3 Use updated Ubuntu 14.04 in CI
The system packages in the base template were
updated via apt-get on 12.07.2017.

We hoped that it will solve mysterious problem of
a network interface being randomly disabled. Sadly
we had no luck, but getting all security updates
also make sense.

Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 16:59:07 +00:00
Jędrzej Nowacki
8b9a8c489f Use updated Ubuntu 16.04 in CI
The system packages in the base template were
updated via apt-get on 12.07.2017.

We hoped that it will solve mysterious problem of
a network interface being randomly disabled. Sadly
we had no luck, but getting all security updates
also make sense.

Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 11:44:27 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Friedemann Kleint
1bdbe06c82 MSVC: Run tests with MSVC2017 instead of MSVC2013
It appears tests compiled with MSVC2013/64bit are prone to
crashes. Keep only a developer build/compile test in default.txt
and move the packacking builds to qt5.txt with tests disabled.
Enable testing with MSVC2017 builds in qt5.txt.

Task-number: QTBUG-58654
Task-number: QTBUG-50835
Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-11 03:30:44 +00:00
Konstantin Tokarev
bbf18ab4ad Add Packaging configs for VS2017 and MinGW to stand-alone QtWebKit builds
Change-Id: I6a51f733d310d8542b184e813f49f1500666d6ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:56 +00:00
Konstantin Tokarev
dd5096c6c7 Conan: update ICU to 59.1, added VS2017 packages
MinGW packages will be upgraded in another patch.

Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:54 +00:00
Konstantin Tokarev
6837a847bb Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host
Also upgrade to Conan 0.24.0.

Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:51 +00:00
Konstantin Tokarev
a96119c121 Provisioning: move Conan manifests to common directory
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.

Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:48 +00:00
Simo Fält
5f37f812f9 Provision homebrew
Some of the macOS templates are cleaner than others and are mising some
basic tools like 7z. Homebrew provides easy way to install wide range of
tools via command line.

Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:16 +00:00
Simo Fält
0001d102f8 Provision libclang
PySide versions following 5.6 use a C++ parser based on Clang.
The Clang library (C-bindings), version 3.9 or higher is
required for building.

Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:09 +00:00
Simo Fält
577140a728 Provision 7z
macOS 10.11 tier1 template is missing 7z.

Change-Id: I9e1ade8605b5e6f389a2cd76340070070a7c637b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:03 +00:00
Konstantin Tokarev
331cf52ff7 Provisioning: Install Ninja on windows hosts used to build cmake-based QtWebKit
Makefile-based generators of CMake are much less efficient than Ninja. They
generate bloated Makefiles that call back to cmake often. Main offender on
Windows is cmake_depends command which seems to do lots of disk reads.

QtWebKit can now switch to ninja automatically if it's present in PATH.
This should help to reduce build times.

Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-03 07:22:38 +00:00
Dominik Holland
1859f9b26c Download and install vc_redist 2015 on windows 7 and 8
This is a dependency of the python3 packages for windows

Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-26 08:12:40 +00:00
Simon Hausmann
2c4b06a13d Centralize Mesa LLVMPipe installation on Windows
Install the DLL for general availability on all Windows systems. Due to
its distinct name it will not be picked up by anyone unless Qt
explicitly selects it.

This gives us the ability to choose the GLES backend to use in Qt.

Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-20 04:44:49 +00:00
Tony Sarajärvi
0dd6023684 Remove provisioning scripts for platforms not supported anymore
Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-14 07:43:39 +00:00
Tony Sarajärvi
52bfe2a9a8 Enable autotest for macOS 10.12
Task-number: QTQAINFRA-1093
Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-14 07:42:53 +00:00
Dominik Holland
a765838889 Fix the python3 packages on openSUSE 42.1
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-13 16:39:12 +00:00
Simon Hausmann
20113e4872 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
2017-06-12 21:36:03 +02:00
Kai Koehne
9b0e908aca Build examples with MSVC 2015 instead of MSVC 2013
Qt WebEngine does not build with MSVC 2013 anymore, hence the examples
from this module weren't tested at all.

The 2015 configuration also places the Qt symbols in a namespace, so
this adds additional coverage.

Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15
Task-number: QTQAINFRA-1271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:22 +00:00
Friedemann Kleint
eb58b173e1 Enforce MinGW developer build
MinGW is very sensitive to inlining / export errors, so having a
developer build check is valuable. Add a MinGW developer build
executing tests to increase coverage and turn off testing for the
packaging build in return.

Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:13 +00:00
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Simon Hausmann
5bc43f0cc3 Fix Postgresql and Mysql environment variables
The correct paths to the headers are

    c:\utils\postgresql[x86]\pgsql\include

not

    c:\utils\postgresql[x86]\pgsql\pgsql\include

Same for libs.

Regression introduced by commit ce47238ed9
but only noticed in the 5.9 branch.

Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-12 04:43:24 +00:00
Sami Nurmenniemi
7456e028a7 Enable CI tests for Boot2Qt
Task-number: QTBUG-60261
Change-Id: I296cf7f9afc15aebf1d2006c51023cb6ac3b0c3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-09 05:43:48 +00:00
Simon Hausmann
0358b6d28c Remove QNX Windows builds
We can't get those to work with the faster KVM based VMs, so disable
these builds for the time being.

Task-number: QTQAINFRA-1208
Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-07 18:10:08 +00:00
Simon Hausmann
303d617329 Disable tests on macOS 10.10
We cannot run graphical tests reliably on 10.10 anymore with the new
virtualization without vmware. As outlined in the referenced task, we
occasionally get the Window Server locking up. So for the time being,
this change disables testing on 10.10.

Task-number: QTQAINFRA-1198
Change-Id: I020d4a298562554838cd7e898df52438db536d7a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2017-06-07 04:16:32 +00:00
Simon Hausmann
35057fe4b2 Clean up windows cleanup script
* There's no need to have a numbered prefix in the common directory
* Instead of deleting directories trees worth several gigabytes of data,
  just rename the directory. The underlying storage system is
  copy-on-write and so deleting the files produces more data than just
  moving the directory out of the way. Deleting the files does not
  actually free up any physical disk space.

Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:40 +00:00
Simon Hausmann
038d263081 Speed up Windows installation of cmake, python, opengl, mysys and Android
We're better off copying off the internal server using CIFS than using
PowerShell's incredibly slow Invoke-WebRequest.

Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:34 +00:00
Simon Hausmann
999b5f5dd7 Speed up Visual Studio update installation
We have a prepared package on the internal server that has everything
necessary included. This way we do not have to download the actual
update content from the internet.

Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2017-06-06 20:15:31 +00:00
Simon Hausmann
ce47238ed9 Improve Postgresql installation on Windows
Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.

Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:28 +00:00
Simon Hausmann
982659b081 Improve mysql installation
* Instead of deleting the files from a previous installation, which will
  not actually release any disk space but just make the qcow2 file
  larger, let's just rename the directory the old files are in.
  That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
  Libraries, binaries and headers. We can skip the installation of
  several thousand documentation files for example, which takes a long
  time.
* Instead of downloading the zip archive via PowerShell's
  Invoke-WebRequest we can get the data much faster using CopyItem off
  the CIFS share. As a bonus this is also more robust against download
  failures.

Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:09 +00:00
Tony Sarajärvi
ba1a8d6216 Provision macOS disable screensaver in current session
Task-number: QTQAINFRA-1244
Change-Id: I3a27d8cdee8cd7b22d86116d58009e952ab536ea
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 03:32:31 +00:00
Jani Heikkinen
5be9b3d2be Add missing ForceDebugInfo -flag for winRT x86_64 builds
Task-number: QTQAINFRA-1233
Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-06-04 19:55:21 +00:00
Akseli Salovaara
8df3b0c7ea Build Windows 10 MSVC2015 x86 on Windows 10 x64 host
Changing MSVC 2015 integration host from 32 bit to 64 bit machine
enables CI for QtWebEngine 32 bit Windows builds.

Change-Id: I3d30df90fa7d92c603a2e91dd528d817e682c214
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-04 19:55:18 +00:00
Heikki Halmet
d514585213 Enable WinRT builds for MSVC 2017
All 2017 configurations are added to qt5.txt for now.

Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-05-11 12:16:23 +00:00
Dominik Holland
a5f3f8ed48 Install python3 on all platforms
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-11 10:29:12 +00:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Jake Petroules
d48b0c3402 Remove Static from the tvOS configuration
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.

Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-06 09:18:10 +00:00
Jake Petroules
dfb0befca3 Remove Static from the watchOS configuration
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.

Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 06:12:36 +00:00
Tony Sarajärvi
4f4de8aa16 Change OS X 10.11 to run tests instead of 10.10
This commit removes OS X 10.10 as a developer build
target, and enables autotests on osx 10.11 developer build.

Task-number: QTQAINFRA-1090
Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 04:34:47 +00:00
Tony Sarajärvi
7937eb2d9e Provisioning: disable screensaver password
Previously provisioning disabled screensaver on startup
but didn't affect current session. Thus the screensaver
hits the VMs while provisioning and without this commit
the screen gets locked. This prevents the lock and
we get to the desktop on the VMs.

Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-04 17:37:00 +00:00
Heikki Halmet
a4a7f71f37 MSVC 2017 updated and missing component for winrt arm
MSVC 2017 and Build Tools updated to version 15.1. Also missing
component 'Visual C++ compilers and libraries for ARM' installed
for winrt arm

Also script added to storage msvc version numbers to versions.txt

Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-03 09:51:17 +00:00
Simon Hausmann
4ee0e8fb46 Fix tier1 template selection for QNX 7 builds on Windows
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b with the tier1 update
from commit 070d9333a6.

Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-05-02 17:16:22 +00:00
Heikki Halmet
385ecebe80 Platform Configurations for Visual Studio 2017
MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build
tools. When winrt arm is available for msvc 2017 in qtbase it will
be added to platform configurations also

Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-02 17:16:19 +00:00
Simo Fält
e3e30b4a2b Provision toolchains and take QNX 7 SDP into use with 64 bit Win10
Task-number: QTQAINFRA-1113
Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-30 06:47:27 +00:00
Simo Fält
e0764f873b Provision and take QNX 7 SDP into use with RHEL 7.2
After enabling QNX 7, we are moving some QNX 6.6 config
to be ran with qt5 integration only.

Task-number: QTQAINFRA-1111
Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-27 10:25:59 +00:00
Sami Nurmenniemi
94e22fcd94 Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning
If normal fontconfig paths are used, qemu parses what ever files it finds from
the toolchain sysroot and the rest from the system fonts. Fix by copying the
system font configurations to a location which prefix that can't be found from
the toolchain sysroot. Links must also be dereferenced or their targets remain
pointing to the toolchain sysroot.

Task-number: QTBUG-59966
Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-27 10:25:56 +00:00