Commit Graph

33 Commits

Author SHA1 Message Date
Simon Hausmann
dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
8470310388 Provisioning: Add variables 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: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-02 05:48:06 +00:00
Simon Hausmann
6bf5691ca8 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
2017-08-31 11:25:26 +02:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Simo Fält
9d65cd5ca5 Provisioning: Install libclang and its dependencies to macos 10.12
Libs and llvm-config is required by pyside. In order to extract
libclang package, we need to install 7zip. 7zip is installed
with homebrew.

Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-23 05:50:26 +00:00
Simo Fält
62c6676f87 Provisioning: Install pip for macOS 10.12
Pip is required to provision python packages.

Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:41 +00:00
Simo Fält
c9f842af84 Provisioning: Install virtualenv for macOS 10.12
Python virtualenv command is used when building pyside modules,
which installs additional Python modules during build time
and requires access to installation directories.

Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:18 +00:00
Tony Sarajärvi
36d7e7a8da Update Xcode to 8.3.3 in macOS 10.12
Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-07-31 20:16:46 +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
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
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
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
Tony Sarajärvi
ed39e440a9 Provision environment variables for SSL autotests
Task-number: QTBUG-56102
Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2017-04-27 10:25:52 +00:00
Simon Hausmann
070d9333a6 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-osx-10.10-x86_64/android.sh
	coin/provisioning/qtci-osx-10.11-x86_64/android.sh

Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
2017-04-25 12:37:26 +02:00
Simon Hausmann
9884a4e98e Make Java installation independent from the disks in the system
Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks
when another disk is present in the system and the DMG ends up at disk2
for example.

Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-25 04:56:11 +00:00
Simon Hausmann
ce9181a964 Improve reliability of automated xcode installation
Instead of downloading a 4+GB archive and uncompressing it in /tmp,
let's uncompress the archive via NFS and feed the data straight into
cpio. This should be faster and avoids curl's error handling that's
happy to abort instead of re-trying.

Change-Id: Ifa5d842c50111ccdbd56e795b270ee6433a63adf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-21 06:22:10 +00:00
Tony Sarajarvi
f2467e5a48 Add java.sh provisioning script for macOS 10.12
Required by Android SDK.

Task-number: QTQAINFRA-1094
Change-Id: I4bde075f95c57fbe919ac2a5c09e25107e8525a1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:30:06 +00:00
Tony Sarajärvi
3d27db23fd Provision OpenSSL to macOS 10.12
Change-Id: I97d811ebbdda69f78bbd5f71ae38847a851a24fe
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:57 +00:00
Tony Sarajärvi
79cc848ab8 Provision Android SDK to macOS 10.12
Task-number: QTQAINFRA-1094
Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:23 +00:00
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
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
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
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
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
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