mirror/qt/qt5.git
22 months agoProvisioning: Disable NTP synchronization for Windows
Jan Arve Sæther [Fri, 10 Nov 2017 11:33:05 +0000 (12:33 +0100)]
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>
(cherry picked from commit 3653630d229390c9ce5517afcce371860d2ad822)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
22 months agoProvisioning: Install signing tools to osx 10.11
Heikki Halmet [Thu, 9 Nov 2017 08:26:25 +0000 (10:26 +0200)]
Provisioning: Install signing tools to osx 10.11

Install needed certificates and signing tools which are
needed when signing release packages

Task-number: QTQAINFRA-1617
Task-number: QTBUG-64477
Change-Id: Ifaefd0e93baa396479380df0b8b99b8b2f1e2017
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
22 months agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 22 Jan 2018 06:54:57 +0000 (08:54 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ie19da83c29c3ab77d1463ba7cf14e8e8258931c3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
22 months agoUse vanilla OS X 10.11
Tony Sarajärvi [Tue, 31 Oct 2017 09:52:13 +0000 (11:52 +0200)]
Use vanilla OS X 10.11

The old version takes up 60GB of disk space which we need to deploy
to all hosts building Qt. As this adds up, should use the same
tier1 images as all the other branches also use.

Task-number: QTQAINFRA-1629
Task-number: QTBUG-64729
Change-Id: I132b65c381a097333577f3132dc61b87da1c78da
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 22 Sep 2017 10:57:05 +0000 (13:57 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Ibafa1abb3f6dae7532892444618490f835ba78cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoMerge remote-tracking branch 'origin/5.6.3' into 5.6
Liang Qi [Mon, 18 Sep 2017 07:20:32 +0000 (09:20 +0200)]
Merge remote-tracking branch 'origin/5.6.3' into 5.6

 Conflicts:
.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c

2 years agoEnsure 'clean' android Installation 5.6.3 v5.6.3
Heikki Halmet [Fri, 15 Sep 2017 07:26:29 +0000 (10:26 +0300)]
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>
2 years agoProvision and build QNX660 on Win 10 x64
Tony Sarajärvi [Fri, 25 Aug 2017 08:32:34 +0000 (11:32 +0300)]
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>
2 years agoprovisioning: install MinGW 530 and 630 for Win10 x64
Tony Sarajärvi [Tue, 29 Aug 2017 06:31:43 +0000 (09:31 +0300)]
provisioning: install MinGW 530 and 630 for Win10 x64

MinGW is an alternative option for Visual Studio. It's
used to create desktop builds and for cross compiling
Android and QNX. At this point it is still unclear which
version is going to be used for what, but as both are
supported, let's think ahead and provide them both.
This also allows us to debug with the other, if the
other is causing problems.

Task-number: QTQAINFRA-1289
Change-Id: I2a922669c07d49370e608c093be80481c8613dc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoProvisioning: Invoke installer with Start-Process
Tony Sarajärvi [Mon, 4 Sep 2017 09:49:20 +0000 (12:49 +0300)]
Provisioning: Invoke installer with Start-Process

By launching an installer with Start-Process and -Wait,
we make sure no handles are left holding on to the
installer when we try to delete it at cleanup.

Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2 years agoProvision: Move Python3 scripts from win8 to win8.1 folder
Tony Sarajärvi [Tue, 12 Sep 2017 07:20:38 +0000 (10:20 +0300)]
Provision: Move Python3 scripts from win8 to win8.1 folder

Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2 years agoUpdate submodules on '5.6.3' in qt5
Qt Submodule Update Bot [Tue, 12 Sep 2017 10:08:04 +0000 (13:08 +0300)]
Update submodules on '5.6.3' in qt5

Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoProvisioning: Fix shasum path
Simo Fält [Thu, 7 Sep 2017 09:07:25 +0000 (12:07 +0300)]
Provisioning: Fix shasum path

Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 changed
the path of shasum, which was not intended. While the
DownloadURL.sh utility is used by rhel in addition to
macOS we can't rely on /usr/bin/shasum but we have to
use the one found from PATH.

Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6.3' in qt5
Qt Submodule Update Bot [Thu, 7 Sep 2017 09:38:34 +0000 (12:38 +0300)]
Update submodules on '5.6.3' in qt5

Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoUpdate submodules on '5.6.3' in qt5
Qt Submodule Update Bot [Wed, 6 Sep 2017 16:10:15 +0000 (19:10 +0300)]
Update submodules on '5.6.3' in qt5

Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoProvisioning: Fix DownloadURL utility's shasum check
Simo Fält [Tue, 5 Sep 2017 04:37:04 +0000 (07:37 +0300)]
Provisioning: Fix DownloadURL utility's shasum check

MacOS 10.10 has older shasum tool, which does not support oneliner
verification.

Change-Id: If00b846d5772aa1991960675d022249d63e7bd77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoAdjust submodule branches
Frederik Gladhorn [Mon, 4 Sep 2017 15:38:58 +0000 (17:38 +0200)]
Adjust submodule branches

2 years agoProvisioning: Hide powershell progress bar for performance
Tony Sarajärvi [Mon, 4 Sep 2017 09:17:45 +0000 (12:17 +0300)]
Provisioning: Hide powershell progress bar for performance

Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoFix Add-Path helper function and start using it in scripts
Joni Jäntti [Mon, 4 Sep 2017 10:25:44 +0000 (13:25 +0300)]
Fix Add-Path helper function and start using it in scripts

This function was broken and only added the latest addition to the
actual PATH.

Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoBuild Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
Akseli Salovaara [Tue, 15 Aug 2017 09:12:22 +0000 (12:12 +0300)]
Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host

From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries
requires Windows 64bit machine. Linking requires more RAM than
Windows 32bit can address. Change MSVC2013 & MSVC2015
integration host machines accordingly.

Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoAdd UploadConfigureExe feature
Aapo Keskimolo [Tue, 29 Aug 2017 10:11:59 +0000 (13:11 +0300)]
Add UploadConfigureExe feature

We used to solve the requirement for uploading configure.exe from
product version, but we can add this as a feature and remove the
dependency to product version.

Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvision vanilla Windows 8.1 x86 and use it
Tony Sarajärvi [Mon, 21 Aug 2017 12:14:00 +0000 (15:14 +0300)]
Provision vanilla Windows 8.1 x86 and use it

Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.

Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 31 Aug 2017 08:39:19 +0000 (11:39 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoprovisioning: windows: ICU
Joni Jäntti [Tue, 22 Aug 2017 12:39:09 +0000 (15:39 +0300)]
provisioning: windows: ICU

Fixed ICU script to actually install ICU instead of just setting the
environment variables. It is required to build qtwebkit.

Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoMake CI use a new provisioned Win 10 template
Joni Jäntti [Fri, 19 May 2017 11:27:35 +0000 (14:27 +0300)]
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: Ieeb2ae3c53841644996d99ca86228df6f825a63a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2 years agoInstall python3 on all platforms
Simo Fält [Wed, 26 Jul 2017 07:19:45 +0000 (10:19 +0300)]
Install python3 on all platforms

Python3 is required in 5.6 by pyside-setup.

Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74)
(cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1)
(cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)

2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 30 Aug 2017 08:16:36 +0000 (10:16 +0200)]
Update submodules on '5.6' in qt5

Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoFix code duplication for cmake installation on Linux
Simon Hausmann [Mon, 28 Aug 2017 10:55:16 +0000 (12:55 +0200)]
Fix code duplication for cmake installation on Linux

Share the code for installing cmake on Linux.

Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoFix adding to path lines for Windows provisioning scripts
Joni Jäntti [Fri, 25 Aug 2017 06:02:36 +0000 (09:02 +0300)]
Fix adding to path lines for Windows provisioning scripts

Currently the path addition command will forget the previous addition
when adding a new string. This hasn't been found out because python
was the only script using this command. Now we also need to set the
path for ruby, so the python string is left out.

Change-Id: I39721d78111550189e52a9f095030033f9660c0a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2 years agoProvisioning: Fine tune cmake provisioning script
Tony Sarajärvi [Tue, 22 Aug 2017 12:06:23 +0000 (15:06 +0300)]
Provisioning: Fine tune cmake provisioning script

Add version printing and move version strings to variables for
easier reuse.

Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoProvisioning: Add $PATH properly in .bashrc
Tony Sarajärvi [Mon, 28 Aug 2017 06:42:02 +0000 (09:42 +0300)]
Provisioning: Add $PATH properly in .bashrc

If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.

Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab
Reviewed-by: Simo Fält <simo.falt@qt.io>
2 years agoProvisioning: Disable system updates
Heikki Halmet [Wed, 9 Aug 2017 12:39:29 +0000 (15:39 +0300)]
Provisioning: Disable system updates

This change will disable system updates from App Store to prevent
unnecessary network load

Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Tue, 15 Aug 2017 14:59:35 +0000 (16:59 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoMake CI use a new win 8.1 provisioning instead of win 8
Joni Jäntti [Thu, 29 Jun 2017 10:46:35 +0000 (13:46 +0300)]
Make CI use a new win 8.1 provisioning instead of win 8

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 8 template.

Made all the Windows platforms use the scripts under
provisioning/common/ instead of duplicate files.

Task-number: QTQAINFRA-1357
Change-Id: Ic3f0b50079b212437fff711379f243753ab84872
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate provisioning scripts with new intra.qt.io address
Tony Sarajärvi [Thu, 3 Aug 2017 07:44:21 +0000 (10:44 +0300)]
Update provisioning scripts with new intra.qt.io address

Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Tue, 8 Aug 2017 07:36:37 +0000 (09:36 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 6 Aug 2017 09:11:04 +0000 (11:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 4 Aug 2017 19:22:15 +0000 (21:22 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoRemove unused provisioning scripts
Simon Hausmann [Tue, 25 Jul 2017 14:42:44 +0000 (16:42 +0200)]
Remove unused provisioning scripts

RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt
5.6 branch. Let's remove the scripts to avoid confusion.

Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2 years agoAdd Documentation feature to one Ubuntu 14.04 build
Frederik Gladhorn [Thu, 22 Jun 2017 12:49:39 +0000 (14:49 +0200)]
Add Documentation feature to one Ubuntu 14.04 build

When creating packages, we build the docs on one configuration.
Previously that was done by magic inside the continuous integration
system. Make it a bit less magic by having a flag for it.

Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 31 Jul 2017 11:50:00 +0000 (14:50 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoTurn off line ending conversion for .commit-template
Joerg Bornemann [Thu, 20 Jul 2017 11:47:19 +0000 (13:47 +0200)]
Turn off line ending conversion for .commit-template

When committing a change, the automatically generated git commit message
consists of

1) The content of .commit-template
2) Informative text for the current commit, generated by git.

While 2) always has LF line endings, even on Windows, 1) might have CRLF
line endings if core.autocrlf=true. The result is a text with mixed line
endings. With the default editor vim, every line of the commit template
part ends with ^M.

Fix this by forcing the line endings of .commit-template to be LF
regardless of core.autocrlf.

Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2 years agoProvisioning: Fix virtualenv in macOS 10.11
Simo Fält [Mon, 17 Jul 2017 08:10:53 +0000 (11:10 +0300)]
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>
2 years agoUse updated Ubuntu 14.04 in CI
Jędrzej Nowacki [Wed, 12 Jul 2017 14:00:50 +0000 (16:00 +0200)]
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>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Tue, 11 Jul 2017 20:59:47 +0000 (23:59 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Tue, 4 Jul 2017 14:32:39 +0000 (17:32 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 3 Jul 2017 11:25:57 +0000 (13:25 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 29 Jun 2017 10:58:43 +0000 (13:58 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 25 Jun 2017 20:53:16 +0000 (23:53 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoCentralize Mesa LLVMPipe installation on Windows
Simon Hausmann [Thu, 15 Jun 2017 14:27:53 +0000 (16:27 +0200)]
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>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 17 Jun 2017 06:38:44 +0000 (09:38 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I6c6a2f3d51f4899809810123112081a47f054358
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoFix Postgresql and Mysql environment variables
Simon Hausmann [Thu, 8 Jun 2017 11:34:20 +0000 (13:34 +0200)]
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 ce47238ed94f3a989c13fef93b037904589910cf
but only noticed in the 5.9 branch.

Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2 years agoRemove QNX Windows builds
Simon Hausmann [Fri, 26 May 2017 17:45:57 +0000 (19:45 +0200)]
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>
2 years agoDisable tests on macOS 10.10
Simon Hausmann [Tue, 6 Jun 2017 12:16:47 +0000 (14:16 +0200)]
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>
2 years agoClean up windows cleanup script
Simon Hausmann [Tue, 9 May 2017 07:46:31 +0000 (09:46 +0200)]
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>
2 years agoSpeed up Windows installation of cmake, python, opengl, mysys and Android
Simon Hausmann [Mon, 8 May 2017 15:09:23 +0000 (17:09 +0200)]
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>
2 years agoSpeed up Visual Studio update installation
Simon Hausmann [Mon, 8 May 2017 14:09:17 +0000 (16:09 +0200)]
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>
2 years agoImprove Postgresql installation on Windows
Simon Hausmann [Mon, 8 May 2017 12:28:56 +0000 (14:28 +0200)]
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>
2 years agoImprove mysql installation
Simon Hausmann [Mon, 8 May 2017 10:15:40 +0000 (12:15 +0200)]
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>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 3 Jun 2017 16:52:30 +0000 (19:52 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 28 May 2017 18:14:57 +0000 (20:14 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoMSVC 2017 updated and missing component for winrt arm
Heikki Halmet [Tue, 2 May 2017 18:25:34 +0000 (21:25 +0300)]
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>
2 years agoget rid of custom 'qt' gitmodules property
Oswald Buddenhagen [Thu, 8 Dec 2016 14:46:06 +0000 (15:46 +0100)]
get rid of custom 'qt' gitmodules property

instead, re-use the (also custom) 'project' property with the magic
value '-' to flag modules which contain no project files at all.

Change-Id: I33163c098852e1b79ad698115aac98217efe1157
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 26 Apr 2017 18:11:25 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoImprove Android SDK/NDK installation on macOS
Simon Hausmann [Mon, 24 Apr 2017 08:34:21 +0000 (10:34 +0200)]
Improve Android SDK/NDK installation on macOS

* Remove unused installation on macOS 10.10 as we only build packages
  on 10.11.

* Replace the use of the ~1GB downloads of the zip files with a direct
  extraction via NFS. This is more resilient to flakyness in the network
  connection.

Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvisioning: MSVC 2017 Build Tools
Heikki Halmet [Wed, 19 Apr 2017 09:23:20 +0000 (12:23 +0300)]
Provisioning: MSVC 2017 Build Tools

MSVC 2017 build tools are pre-provisioned to windows 10 templates

Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoignore submodules in dirtiness check
Oswald Buddenhagen [Wed, 12 Apr 2017 11:38:02 +0000 (13:38 +0200)]
ignore submodules in dirtiness check

changed submodule sha1s should not prevent updating.

Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 21 Apr 2017 18:11:40 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 13 Apr 2017 18:12:37 +0000 (20:12 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoProvisioning: Change tier1 templates for Windows 10
Heikki Halmet [Wed, 12 Apr 2017 11:25:31 +0000 (14:25 +0300)]
Provisioning: Change tier1 templates for Windows 10

These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also

Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agoFix provision help script DownloadURL.sh
Tony Sarajärvi [Mon, 10 Apr 2017 04:58:49 +0000 (07:58 +0300)]
Fix provision help script DownloadURL.sh

The script neglected the result of the sha1 after download.
Even with a failure it exited nicely.

Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoserialize build of qtwebkit and qtwebengine
Oswald Buddenhagen [Mon, 6 Feb 2017 19:48:22 +0000 (20:48 +0100)]
serialize build of qtwebkit and qtwebengine

linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.

Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2 years agofix url normalization
Oswald Buddenhagen [Mon, 27 Mar 2017 14:01:31 +0000 (16:01 +0200)]
fix url normalization

after 8c0390143, we cannot rely on the denormalized segment starting
with a slash any more.

Task-number: QTBUG-59753
Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 5 Apr 2017 18:11:14 +0000 (20:11 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 1 Apr 2017 13:31:18 +0000 (15:31 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoProvisioning: Bug fix patch for msvc 2015 update 3
Heikki Halmet [Thu, 30 Mar 2017 11:05:16 +0000 (14:05 +0300)]
Provisioning: Bug fix patch for msvc 2015 update 3

This bug fix patch is needed for QtWebEngine

Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2 years agoCoin provisioning: Use arg instead of autodetecting architecture
Simo Fält [Mon, 27 Feb 2017 13:04:41 +0000 (15:04 +0200)]
Coin provisioning: Use arg instead of autodetecting architecture

When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.

Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2 years agoProvisioning: Move Visual Studio installation to pre-provisioning
Heikki Halmet [Fri, 17 Mar 2017 11:34:17 +0000 (13:34 +0200)]
Provisioning: Move Visual Studio installation to pre-provisioning

Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly

Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Fri, 17 Mar 2017 19:03:02 +0000 (20:03 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoReflect current URL in example comment
Jason Erb [Tue, 14 Mar 2017 02:46:23 +0000 (22:46 -0400)]
Reflect current URL in example comment

Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Tue, 14 Mar 2017 19:02:54 +0000 (20:02 +0100)]
Update submodules on '5.6' in qt5

Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoRemove init-repository assumption of repo url “…/qt/<repo>”
Jason Erb [Tue, 7 Mar 2017 23:08:11 +0000 (18:08 -0500)]
Remove init-repository assumption of repo url “…/qt/<repo>”

Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2 years agoProvision: Storage icu version to versions.txt
Heikki Halmet [Fri, 3 Feb 2017 11:02:29 +0000 (13:02 +0200)]
Provision: Storage icu version to versions.txt

~/versions.txt will be used to storage sw version information

Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Thu, 23 Feb 2017 19:02:11 +0000 (20:02 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoUpdate submodules on '5.6' in qt5
Liang Qi [Fri, 10 Feb 2017 19:01:22 +0000 (20:01 +0100)]
Update submodules on '5.6' in qt5

Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47
Reviewed-by: Liang Qi <liang.qi@qt.io>
2 years agoProvisioning: Update opengl32.dll x86 on Windows 10 x64
Akseli Salovaara [Mon, 30 Jan 2017 08:29:06 +0000 (10:29 +0200)]
Provisioning: Update opengl32.dll x86 on Windows 10 x64

OpenGL32 update is needed for autotests to pass.
At least tst_qglbuffer vertexBuffer will fail without an update.
This update is already in place on Windows x86 and x64 CI hosts but
applied only to System32 -folders.

Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvisioning: Install postgresql x86 and x64 libraries to Windows 10
Akseli Salovaara [Thu, 15 Dec 2016 07:14:25 +0000 (09:14 +0200)]
Provisioning: Install postgresql x86 and x64 libraries to Windows 10

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64
Akseli Salovaara [Thu, 15 Dec 2016 07:11:48 +0000 (09:11 +0200)]
Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvisioning: Install MySQL x86 and x64 libraries to Windows10 x64
Akseli Salovaara [Thu, 15 Dec 2016 07:05:11 +0000 (09:05 +0200)]
Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64

Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2 years agoProvisioning: Visual Studio 2015 with update 3
Heikki Halmet [Thu, 26 Jan 2017 11:17:19 +0000 (13:17 +0200)]
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>
2 years agoUpgrade CMake to 3.6.2
Konstantin Tokarev [Wed, 28 Sep 2016 10:07:43 +0000 (13:07 +0300)]
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 77eeee64a43c5c448321b8f5ac7b64c872e14489)

2 years agoUpgrade CMake to 3.6.2 on Windows 7 builder
Konstantin Tokarev [Sun, 6 Nov 2016 19:44:29 +0000 (22:44 +0300)]
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 daa865312104e7d5d073b0a63e0f50c8a04b9697)

2 years agoUpgrade CMake to 3.6.2 on Windows 8
Simo Fält [Mon, 6 Feb 2017 08:55:06 +0000 (10:55 +0200)]
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>
2 years agoProvision: Storage android sdk and ndk version information
Heikki Halmet [Tue, 10 Jan 2017 07:59:14 +0000 (09:59 +0200)]
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>
2 years agoProvision: Script to print sw versions to provision log
Heikki Halmet [Tue, 10 Jan 2017 13:26:57 +0000 (15:26 +0200)]
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>
2 years agoUpdate jom to 1.1.2
Joerg Bornemann [Tue, 22 Nov 2016 09:45:09 +0000 (10:45 +0100)]
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>
2 years agoRevert "Clean up usage of qtsvg as dependency"
Frederik Gladhorn [Mon, 16 Jan 2017 13:21:47 +0000 (14:21 +0100)]
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 fbd782636b6ee413d2b6e8bca408263297194254.

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>
2 years agoProvision: Script for linux to remove preinstalled software
Heikki Halmet [Thu, 2 Feb 2017 07:07:50 +0000 (09:07 +0200)]
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>
2 years agoAndroid sdk and ndk to provisioning for Windows 7
Heikki Halmet [Wed, 25 Jan 2017 08:12:36 +0000 (10:12 +0200)]
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>
2 years agoProvision: Set bash_profile to read .bashrc
Heikki Halmet [Thu, 19 Jan 2017 09:49:24 +0000 (11:49 +0200)]
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>