Commit Graph

152 Commits

Author SHA1 Message Date
Tony Sarajärvi
e5f0b04f12 Update Xcode 8.3.1 to macOS 10.12
Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-18 22:08:33 +00:00
Simon Hausmann
fa903eba4b Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
2017-04-13 21:54:47 +02:00
Konstantin Tokarev
aac3786d67 Add cmake location to PATH when provisioning macOS 10.12
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-12 08:55:39 +00:00
Tony Sarajärvi
b8211774d9 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>
2017-04-10 17:27:24 +00:00
Liang Qi
6720096ee0 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
2017-04-08 16:04:53 +02:00
Konstantin Tokarev
0c7c11ca56 Fix AltUrl of cmake for macOS provisioning
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-07 22:04:06 +00:00
Sami Nurmenniemi
e3d84a49c0 Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.

Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-04 05:06:46 +00:00
Liang Qi
285ee106e7 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.

Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
2017-04-03 12:06:27 +00:00
Heikki Halmet
e00cb3ac59 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>
2017-03-31 06:42:09 +00:00
Simo Fält
8b59bbc2a4 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>
2017-03-30 15:14:04 +00:00
Heikki Halmet
80b739b1e8 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>
2017-03-22 09:31:06 +00:00
Allan Sandfeld Jensen
3e35991013 Install g++-multilib on Ubuntu 16.04 platforms
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.

Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-16 06:20:01 +00:00
Tony Sarajärvi
b14198730d Remove command line tools from macOS 10.11 and 10.12
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.

Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-15 13:21:40 +00:00
Kari Oikarinen
b037d8f7b1 Provision libusb for 64-bit Windows 8 and 10 as well
Amends 380fca84a9fe583e245355f2e36931473665cf0b.

Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-03-14 07:03:11 +00:00
Simon Hausmann
2d59a20361 Fix network test server setup
Use the correct IP address for the network test server that all the
other machines are using as well.

Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f
Task-number: QTBUG-59241
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-03-10 06:10:43 +00:00
Liang Qi
ad3c519525 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
2017-03-04 22:21:23 +01:00
Teemu Holappa
111799abf1 Add qemu user mode binary
qemu is used to run unit tests for arm binaries in coin.

Change-Id: I8610b5d7603fa3bcd5cf0f9e83ee38e219b60a85
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-03 14:37:46 +00:00
Akseli Salovaara
8de4f42cb6 Provisioning: Upgrade conan version from 0.16.0 to 0.20.2
Conan provisioning fails on private Coin instance due to error message
Could not find a version that satisfies the requirement conan==0.16.0
(from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1,
0.20.2)
No matching distribution found for conan==0.16.0

Upgrading to 0.16.1 resulted warning
"Your conan's client version is deprecated
for the current remote (v0.20.2). Upgrade conan client."
and provisioning failed with "ERROR: All remotes failed"

After upgrade to 0.20.2 conan provisioning script is working again.

Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-03-03 12:26:24 +00:00
Allan Sandfeld Jensen
5f598f67f3 Add libxss-dev needed by QtWebEngine
Change-Id: Iac7e6b730803865d00b17d53e6aa488e80123b5b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-01 16:34:16 +00:00
Heikki Halmet
460cfd01b3 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>
2017-02-28 07:23:53 +00:00
Liang Qi
848c4ac3f8 Merge remote-tracking branch 'origin/5.6' into 5.8
Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
2017-02-17 15:22:56 +01:00
Tony Sarajärvi
00635a672a Provision: Set bash_profile to read .bashrc in macOS 10.12
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.

Task-number: QTQAINFRA-1091
Change-Id: I72206dbd8f7289de86830db23fa1ae2c548181eb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:14 +00:00
Tony Sarajarvi
c4a5844e25 Add MySQL provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: Id20e5398007284ddf809f2c2c49a60711729db26
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:10 +00:00
Tony Sarajarvi
a8348c9e6c Add postgresql.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: Idf314816d4986855b0b4d92a5f523ec1397f4083
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:06 +00:00
Tony Sarajarvi
430aa0192d Add cmake.sh to provisioning for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:03 +00:00
Tony Sarajarvi
1dbe2c1ff4 Add command line tool provisioning for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I2b209c8ca59af5bfdcc1faa46ac771a85eeb457e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:59 +00:00
Tony Sarajarvi
c3fa9ffd76 Add xcode.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I6d2071c3304cc8df31d8bbad6d713d21ea2dda25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:56 +00:00
Tony Sarajarvi
884d198a34 Add xz.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I5594ae5591ad0b092ed000da8930972475163f51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:51 +00:00
Tony Sarajärvi
a56c7ef768 macOS 10.12: Switch crash reporting to server mode
Task-number: QTQAINFRA-1091
Change-Id: I49c2f92f570a648e80ac16180bdf0c7967ed1120
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:47 +00:00
Tony Sarajarvi
8254e8659f Add system setup provisioning script for macOS 10.12
Task-numer: QTQAINFRA-1091
Change-Id: I0da0e22dd859609fa107b9c157a678a4e2d252e4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:43 +00:00
Tony Sarajärvi
58ad2e46f3 Add system setup provisioning script for Ubuntu 16.04
Task-number: QTQAINFRA-1099
Change-Id: I4ea578b65aca8511641a61461fd1295a3723fdab
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-13 14:27:28 +00:00
Tony Sarajärvi
d6beaa6f27 Add APT package provisioning to Ubuntu 16.04
Task-number: QTQAINFRA-1099
Change-Id: Ie884846a21c3962aeeb83762113475f9eaf2f20d
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-13 14:27:25 +00:00
Akseli Salovaara
880e750629 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>
2017-02-10 06:14:13 +00:00
Akseli Salovaara
f1f9b94b00 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>
2017-02-10 06:14:10 +00:00
Akseli Salovaara
fb7581847e 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>
2017-02-10 06:14:08 +00:00
Akseli Salovaara
da4c2e21b1 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>
2017-02-10 06:14:06 +00:00
Tony Sarajärvi
9c80884735 Provisioning: remove extra crashreport script
We have a duplicate of the same file, but different name.

Change-Id: Iedd70498a91bde0dddb05c33972fd21274399ae8
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:20 +00:00
Tony Sarajärvi
ae5c1d4f5d Provisioning: remove Android provisioning script
Android tools and NDK is not needed in 10.11.

Task-number: QTQAINFRA-1087
Change-Id: I8f3f4e71492ea09828823f6ef70ab29faa08934c
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:17 +00:00
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
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