aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provision: Storage android sdk and ndk version informationHeikki Halmet2017-02-031-18/+30
| | | | | | | | | | | 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>
* Provision: Script to print sw versions to provision logHeikki Halmet2017-02-032-0/+87
| | | | | | | | 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>
* Update jom to 1.1.2Joerg Bornemann2017-02-031-3/+3
| | | | | | | | | | | | | | | | | 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>
* Revert "Clean up usage of qtsvg as dependency"Frederik Gladhorn2017-02-031-3/+3
| | | | | | | | | | | | | | | 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>
* Provision: Script for linux to remove preinstalled softwareHeikki Halmet2017-02-031-0/+49
| | | | | | | | | | | | | | | 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>
* Android sdk and ndk to provisioning for Windows 7Heikki Halmet2017-01-285-0/+74
| | | | | | | | | | 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>
* Provision: Set bash_profile to read .bashrcHeikki Halmet2017-01-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | 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>
* Add Android NDK/SDK to provision for macOS 10.10 and 10.11Heikki Halmet2017-01-247-0/+265
| | | | | | | | | 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>
* Update submodules on '5.6' in qt5Liang Qi2017-01-223-0/+0
| | | | | | Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update submodules on '5.6' in qt5Liang Qi2017-01-172-0/+0
| | | | | Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2017-01-122-0/+0
| | | | | | Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add CI build configurationsSimon Hausmann2017-01-112-0/+43
| | | | | | | | | | | | These files were previously stored in the CI source tree, but they do belong here. They describe the different configurations under which we want to build Qt and its submodules, in terms of underlying virtual machine template, host OS, target OS and CI related features that may also map to Qt configuration features. Task-number: QTQAINFRA-1074 Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Provision: Cmake 3.6.2Heikki Halmet2017-01-114-0/+212
| | | | | | | | Red Hat 6.6 needs cmake for GammaRay OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add provision helper file to install compressed packagesTony Sarajärvi2017-01-111-0/+120
| | | | | Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add DownloadURL.sh provisioning helper scriptTony Sarajarvi2017-01-111-0/+85
| | | | | Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add provisioning try-catch helper script for bashTony Sarajarvi2017-01-111-0/+64
| | | | | Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Improve build performance on WindowsSimon Hausmann2017-01-095-0/+15
| | | | | | | | | Disable the windows search indexing service, which has a tendency to start indexing source code archives that we've just extracted. We are not interested in this service. Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Provisioning: Disable Windows DefenderSimo Fält2017-01-065-0/+25
| | | | | | | This will reduct the timeouts coin has had recently with win machines. Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove shutdown "helpers" for macOSSimon Hausmann2016-12-214-34/+0
| | | | | | | | | It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provision: Install pyside python dependencies to WindowsSimo Fält2016-12-191-0/+4
| | | | | | | | To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provision: Install pyside python dependencies to LinuxSimo Fält2016-12-193-0/+15
| | | | | | | | To test successfully pyside dependencies with Coin, we need python-dev packages and virtual env. Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provision: Android openssl 1.0.2j for Windows 7Heikki Halmet2016-12-162-0/+46
| | | | | | | | | | | We are currently using too old openssl for Android builds in Windows 7. Openssl version need to be at least 1.0.1. This script will configure openssl 1.0.2j for Android using tools from msys. Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Improve disabling of screensaver on macOSSimon Hausmann2016-12-084-4/+96
| | | | | | | | | | Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Suppress shutdown indicator in UbuntuJędrzej Nowacki2016-12-074-0/+12
| | | | | | | | | We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Disable the screensaver on macOS definitely and permanentlySimon Hausmann2016-12-074-0/+12
| | | | | | Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix paths for provisioning on macOSSimon Hausmann2016-12-074-0/+0
| | | | | | | | | The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix macOS provisioning not shutting down cleanlyFrederik Gladhorn2016-12-074-0/+34
| | | | | | | | | | | | | After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* don't fail to check out some modules in pinned modeOswald Buddenhagen2016-11-301-1/+8
| | | | | | | | | | | | | | | when used without the --branch option, we clone with --no-checkout, to avoid unnecessarily checking out files twice when the recorded sha1 doesn't happen to be the tip of the default branch. however, that would leave the index in a dirty state which would make the subsequent submodule update abort at some point, silently. to deal with the problem, we ignore this type of index dirtyness and use submodule update with --force. Task-number: QTBUG-57289 Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* refuse to operate with dirty submodulesOswald Buddenhagen2016-11-301-0/+28
| | | | | | | | the operation would later error out anyway, after spending a lot of time fetching the remotes, and leaving a partially updated state behind. Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-3035-0/+0
| | | | | Change-Id: I88a559589ffd21c7436df6c644c92db21244860d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-262-0/+0
| | | | | Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add basic Ubuntu 16.04 provisioningFrederik Gladhorn2016-11-252-0/+48
| | | | | Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-2510-0/+0
| | | | | Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-234-0/+0
| | | | | Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provision OPENSSL env variable for openSUSE 13.1Tony Sarajärvi2016-11-221-0/+38
| | | | | | | | | | | | Fix building on OpenSuse after openssl update. Every linux distro seems to patch openssl in a different way to deal with broken/outdated SSL issues. We seem unable to detect what suse did when running configure, so this is a stop-gap measure. Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-225-0/+0
| | | | | Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-185-0/+0
| | | | | Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-165-0/+0
| | | | | Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25 Reviewed-by: Liang Qi <liang.qi@qt.io>
* produce less ugly paths to the commit template in submodulesOswald Buddenhagen2016-11-141-1/+1
| | | | | | Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* add --no-fetch optionOswald Buddenhagen2016-11-141-4/+12
| | | | | | | | | there is no point in re-fetching all repositories just because an update failed due to local modifications. Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-1133-0/+0
| | | | | Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* fix cloning of tagged versionsOswald Buddenhagen2016-11-041-2/+7
| | | | | | | | | | | | | | | | the .gitmodules of tagged commits typically refers to a release branch which was deleted shortly after the release. consequently, git clone --branch is bound to fail. of course, cloning a fixed sha1/tag requires no branch in the first place, so revert back to using git clone --no-checkout in that case. amends ac6168c0c. Task-number: QTBUG-49133 Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-044-0/+0
| | | | | Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-039-0/+0
| | | | | Change-Id: I3f4f3b15e3528c319c1479759282571759477faf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Clean up usage of qtsvg as dependencyFrederik Gladhorn2016-11-021-3/+3
| | | | | | | | | | | | There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-312-0/+0
| | | | | Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-296-0/+0
| | | | | Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-279-0/+0
| | | | | Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-2212-0/+0
| | | | | Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-144-0/+0
| | | | | Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>