aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Disable tests on macOS 10.10Simon Hausmann2017-06-071-1/+1
| | | | | | | | | | | 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>
* Clean up windows cleanup scriptSimon Hausmann2017-06-066-6/+6
| | | | | | | | | | | | | * 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>
* Speed up Windows installation of cmake, python, opengl, mysys and AndroidSimon Hausmann2017-06-067-10/+10
| | | | | | | | | 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>
* Speed up Visual Studio update installationSimon Hausmann2017-06-063-34/+62
| | | | | | | | | | 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>
* Improve Postgresql installation on WindowsSimon Hausmann2017-06-063-23/+44
| | | | | | | | | 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>
* Improve mysql installationSimon Hausmann2017-06-061-44/+34
| | | | | | | | | | | | | | | | | | * 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>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-035-0/+0
| | | | | Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-05-297-0/+0
| | | | | Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* MSVC 2017 updated and missing component for winrt armHeikki Halmet2017-05-036-7/+93
| | | | | | | | | | | 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>
* get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-272-3/+3
| | | | | | | | | | | | | | 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>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-272-0/+0
| | | | | Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Improve Android SDK/NDK installation on macOSSimon Hausmann2017-04-242-123/+10
| | | | | | | | | | | | * 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>
* Provisioning: MSVC 2017 Build ToolsHeikki Halmet2017-04-244-5/+101
| | | | | | | MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* ignore submodules in dirtiness checkOswald Buddenhagen2017-04-231-1/+1
| | | | | | | | 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>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-235-0/+0
| | | | | Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-143-0/+0
| | | | | Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: Change tier1 templates for Windows 10Heikki Halmet2017-04-136-6/+162
| | | | | | | | 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>
* Fix provision help script DownloadURL.shTony Sarajärvi2017-04-101-0/+4
| | | | | | | | 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>
* serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-062-2/+3
| | | | | | | | | | | 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>
* fix url normalizationOswald Buddenhagen2017-04-061-1/+1
| | | | | | | | | | 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>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-064-0/+0
| | | | | Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-018-0/+0
| | | | | Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Bug fix patch for msvc 2015 update 3Heikki Halmet2017-03-312-0/+100
| | | | | | | This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Coin provisioning: Use arg instead of autodetecting architectureSimo Fält2017-03-3012-32/+28
| | | | | | | | | 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>
* Provisioning: Move Visual Studio installation to pre-provisioningHeikki Halmet2017-03-226-71/+10
| | | | | | | | | | | 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>
* Update submodules on '5.6' in qt5Liang Qi2017-03-201-0/+0
| | | | | Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Reflect current URL in example commentJason Erb2017-03-161-1/+1
| | | | | Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2017-03-163-0/+0
| | | | | Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Remove init-repository assumption of repo url “…/qt/<repo>”Jason Erb2017-03-131-7/+7
| | | | | | | Task-number: QTBUG-59355 Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Provision: Storage icu version to versions.txtHeikki Halmet2017-02-281-0/+3
| | | | | | | ~/versions.txt will be used to storage sw version information Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2017-02-254-0/+0
| | | | | Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2017-02-119-0/+0
| | | | | Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Update opengl32.dll x86 on Windows 10 x64Akseli Salovaara2017-02-101-0/+63
| | | | | | | | | | 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>
* Provisioning: Install postgresql x86 and x64 libraries to Windows 10Akseli Salovaara2017-02-101-0/+84
| | | | | | | | 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>
* Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64Akseli Salovaara2017-02-101-0/+86
| | | | | | | | 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>
* Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64Akseli Salovaara2017-02-101-0/+112
| | | | | | | | 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>
* Provisioning: Visual Studio 2015 with update 3Heikki Halmet2017-02-073-0/+124
| | | | | | | | | 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>
* Upgrade CMake to 3.6.2Konstantin Tokarev2017-02-073-0/+12
| | | | | | | | | | 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)
* Upgrade CMake to 3.6.2 on Windows 7 builderKonstantin Tokarev2017-02-071-0/+1
| | | | | | | Task-number: QTQAINFRA-996 Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit daa865312104e7d5d073b0a63e0f50c8a04b9697)
* Upgrade CMake to 3.6.2 on Windows 8Simo Fält2017-02-072-0/+2
| | | | | | | Pyside requires CMake 3.0 or higher Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 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>