Commit Graph

4592 Commits

Author SHA1 Message Date
Tony Sarajärvi
8f9d75f18f Add command line tools provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I51aa4ee850d8e8603fac78572942e3be8f1175e4
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:36:15 +00:00
Tony Sarajärvi
0b3c843fb2 Add MySQL provisioning script to OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: If10ba5d5d3f2b4891098ffad8519fe4e16d8c268
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:13 +00:00
Tony Sarajärvi
fc32c9bbf7 Add postgresql provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: Ia186b8df007384f7fd03139ad448563b920ee21b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:10 +00:00
Tony Sarajärvi
13ed034dc3 Add Cmake provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: If598b4b8391e13ed0891d8a65f752492fe303d29
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:08 +00:00
Tony Sarajärvi
f7d20b7cc2 Add XCode provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I416b38459ef278f82af0379b46fd78f5ccc6512c
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:05 +00:00
Tony Sarajärvi
7a48b0d17c Add xz.sh provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I29879e17a18ffb7950c7a85db75f4bc2765741d5
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:36:02 +00:00
Tony Sarajarvi
f969320ac5 Add provisioning PKG install helper script for bash
Task-number: QTQAINFRA-1087
Change-Id: I93f33e2e93371f68f31a9ed8b4d9c89ee091b629
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:35:59 +00:00
Tony Sarajarvi
dd1b6e53b1 Add provisioning helper script for installing compressed files
This script downloads a file from a given URL,
uncompresses it and installs it to a desired location.

Task-number: QTQAINFRA-1087
Change-Id: I466cb81ec6c96bb0d46329ec98dcc4f31be173ec
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:35:56 +00:00
Tony Sarajärvi
d6f56195bc Add system setup provisioning for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: Icba6d58c56fc00b4fe3a7a3f72050465ff64d104
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:35:54 +00:00
Liang Qi
15e396f7c3 Update submodules on '5.8' in qt5
Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-08 08:34:46 +00:00
Heikki Halmet
ad97fd589f Provisioning: Visual Studio 2015 with update 3
Common install script for Visual Studio installation and
updates. Latest Visual Studio 2015 update is required
for releases

Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-07 19:25:11 +00:00
Konstantin Tokarev
25160f24b6 Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 77eeee64a4)
2017-02-07 19:25:07 +00:00
Konstantin Tokarev
2835a4d873 Upgrade CMake to 3.6.2 on Windows 7 builder
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit daa8653121)
2017-02-07 19:25:03 +00:00
Simo Fält
f65479ee0c Upgrade CMake to 3.6.2 on Windows 8
Pyside requires CMake 3.0 or higher

Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-07 19:24:59 +00:00
Heikki Halmet
c8372d3641 Linux android builds to RHEL 7.2
In 5.9 android builds will be using
RHEL 7.2 instead of 6.6

Task-number: QTQAINFRA-1096
Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-06 12:07:46 +00:00
Liang Qi
5035a69e55 Update qtbase manually
Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-06 08:02:38 +00:00
Jani Heikkinen
b071c82d19 Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9 2017-02-06 07:12:39 +00:00
Frederik Gladhorn
ce7b09a1fc Add speech-dispatcher-devel to RHEL
Without this Qt Speech is useless in our packages.

Task-number: QTBUG-58461
Change-Id: I5c93fae1b3a2987353c75865f1b0831114afedbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-05 16:53:46 +00:00
Simon Hausmann
527829a600 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
2017-02-05 15:17:50 +01:00
Liang Qi
bbdeca02e9 Merge "Merge remote-tracking branch 'origin/5.6' into 5.8" into refs/staging/5.8 2017-02-04 14:20:27 +00:00
Liang Qi
4b45cd68d4 Update submodules on '5.8' in qt5
Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-04 06:19:21 +00:00
Simon Hausmann
d641d6546b Merge remote-tracking branch 'origin/5.6' into 5.8
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
2017-02-03 09:15:43 +01:00
Heikki Halmet
a36977963a Provision: Storage android sdk and ndk version information
Sdk and ndk version information will be storaged to versions.txt.
Versions.txt will be used for all provision scripts and later on it's
data will be printed to provision log.

Also script name changed to match both android sdk and ndk.

Change-Id: I3366e596f539099c3b587466d90905d0889398fe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-03 05:47:05 +00:00
Heikki Halmet
6afffd6985 Provision: Script to print sw versions to provision log
This script is the last script that is run by provisioning. It will
print all storaged sw information to provision log

Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-03 05:46:57 +00:00
Joerg Bornemann
32b5e271a8 Update jom to 1.1.2
The most important changes that affect the CI are:
  - Fixed bogus path in error message for failed targets.
  - Fixed error "JobClient destroyed while still acquiring."
    that could be yielded for failed builds.
  - Fixed /k option (QTCREATORBUG-17131).
  - Added the special .NOTPARALLEL target that disables parallel
    build for the containing makefile. (This one is needed to
    build QtWebEngine in debug-and-release properly.)
  - Introduced the JOMFLAGS environment variable.
    This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up
    separate flags for nmake and jom.

Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-03 05:46:51 +00:00
Frederik Gladhorn
713188e4af Revert "Clean up usage of qtsvg as dependency"
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.

This reverts commit fbd782636b.

Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-03 05:46:43 +00:00
Heikki Halmet
0c8536fc0a Provision: Script for linux to remove preinstalled software
Script to remove tier1's preinstalled software. Script itself includes
all information about the software that needs to be removed from tier2
before provision starts to run installations. When this script is run
for certain platform that platform needs to provision all removed
software back to tier2 template. So user needs to make sure that all
needed provision script are available when calling this removal-script.
Goal is to have vanilla os when provision don't need to remove any
software before installations. When this goal is reached this script
and script calls can be removed from provision.

Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-03 05:46:33 +00:00
Oswald Buddenhagen
2c1d5ad754 Merge remote-tracking branch 'gerrit/dev' into 5.9 2017-02-01 21:04:15 +01:00
Kari Oikarinen
321d5f1488 Provision libusb-1.0 for Windows
It's needed by tqtc-boot2qt/qdb.

Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-31 18:33:44 +00:00
Kari Oikarinen
db9682888c Add PS provisioning helper for 7-Zip files
Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-31 18:33:41 +00:00
Liang Qi
07b72ae2c3 Update qtconnectivity manually
Change-Id: Ic3c8400ab26b09277752e5b9b347dc7a33679618
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-31 17:16:33 +00:00
Simon Hausmann
dfaa59fcb3 Bump Android API level to 21
This extends commit f3b0b9e292 to the
macOS and Windows platforms.

Change-Id: I180d81266897582cee1bec5938fbd3bb9c5c2ee3
Task-number: QTBUG-58367
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2017-01-31 12:37:11 +00:00
Liang Qi
a20cc5b452 Merge remote-tracking branch 'origin/5.8' into dev
Task-number: QTBUG-58371
Change-Id: I9d7027c72fb10b5cc549762d8bb1f13ee5ec9c5d
2017-01-30 10:00:59 +01:00
Liang Qi
9be869ba48 Merge remote-tracking branch 'origin/5.6' into 5.8
Task-number: QTBUG-58371
Change-Id: Ic3ec10a04ec9fcfea38324f6052b2d082c6ece58
2017-01-28 12:21:28 +01:00
Heikki Halmet
d4681ee690 Android sdk and ndk to provisioning for Windows 7
Installs latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.

Task-number: QTBUG-58369
Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-28 03:57:41 +00:00
Liang Qi
98fa30e28e Update submodules on '5.8' in qt5
Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-28 03:56:27 +00:00
Liang Qi
0874dba009 Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
2017-01-26 15:54:16 +01:00
Liang Qi
18967fce7d Update submodules on '5.8' in qt5
Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-26 00:13:35 +00:00
Oswald Buddenhagen
29a926f941 Adjust submodule branches
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
2017-01-25 11:39:31 +01:00
Simo Fält
61c59c145b Restore RHEL 7.2 in the dev branch (5.9)
RHEL7.2 was disabled due to blocking configure change.

Task-number: QTBUG-58073
Change-Id: Ic517d53bddecbcf035410d4f22a678ab72e0d44d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-25 03:24:37 +00:00
Liang Qi
f8eb9821c3 Update submodules on 'dev' in qt5
Change-Id: I80604b065ad943f7bbddeb6dba4ba05a78ba2c05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-24 22:37:07 +00:00
Heikki Halmet
3276f075b9 Provision: Set bash_profile to read .bashrc
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.

This brings the behavior of the system closer to what we see as
developers.

However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.

On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.

For consistency we apply the same logic to the macOS configurations.

Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:27 +00:00
Heikki Halmet
eeea4e5c3a Add Android NDK/SDK to provision for macOS 10.10 and 10.11
Install latest Android sdk and ndk.
It also runs update for SDK API level 18

Task-number: QTBUG-58370
Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:24 +00:00
Jesus Fernandez
1b8b891910 Add Coverity-Id to .commit-template
Change-Id: Icb7321584c59f5322ae2fb6d75f9d1b7ba2fcfe2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-24 10:23:27 +00:00
Liang Qi
84ed87b496 Update submodules on '5.8' in qt5
Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-24 09:40:15 +00:00
Liang Qi
80358b1e1d Update submodules on 'dev' in qt5
Change-Id: Ia7ef89c8452841c3bbf56bada0060e977fd310cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-23 15:33:13 +00:00
Liang Qi
1a3ff2b1af Update submodules on '5.8' in qt5
Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-22 11:15:48 +00:00
Liang Qi
07cc7ef71a Update submodules on '5.6' in qt5
Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-01-22 10:28:45 +00:00
Alex Blasche
f3b0b9e292 Bump Android API level version to 21
This is required for new Bluetooth features in Qt 5.9+.

Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-21 07:58:40 +00:00
Liang Qi
3e4f86d652 Update submodules on '5.8' in qt5
Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-19 16:10:16 +00:00