Commit Graph

920 Commits

Author SHA1 Message Date
Simo Fält
6a0591da9a Merge remote-tracking branch 'origin/ifw-5.12.10' into ifw-5.12.11
Task-number: QTIFW-2130
Change-Id: I3c045c06262547fc226e563c0e861d9aa855de18
2021-10-05 14:01:39 +03:00
Heikki Halmet
0253936025 Provisioning: Add needed packages for supporting libarchive
This is required by IFW

Task-number: QTIFW-2310
Change-Id: Iade1ff6339bfe43f3f35486377f6c77ae593cec3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-08 08:37:04 +03:00
Dimitrios Apostolou
f7f32fa293 08-pythondev build should not execute external script
The important bits of the script were copied and modified.

NOTE that we no longer build openssl from source, the distro (SLES15) provides
a version that works well.

Task-number: QTQAINFRA-3528
Change-Id: Iad63d75055a7efc3e104789e4a515b8511cf0880
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit db23c64876)
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-08 08:37:03 +03:00
Toni Saario
5ba9b7c979 Disable D3D12 on Windows IFW
Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-06-17 06:24:03 +00:00
Simo Fält
55a2b79e22 Disable not needed platform configs from ifw specific branch
While the branch is installer-framework specific, there is no need to
re-verify such platform configurations which are not used by
installer-framework.

Change-Id: If7023b98e83167260e8d4a06a9575e3aaa75fe4c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:33 +03:00
Simo Fält
52bd6da041 Hide LLVM_INSTALL_DIR from qdoc in Windows
Currently provisioned libclang is not working with static runtime build
in Windows. To allow integration to pass, we need to skip building of
qdoc by hiding required libs from it.

Change-Id: I2b2bbc20d1bb016552ed1b3d4e70dc9c0544fcce
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:30 +03:00
Simo Fält
3fd82a915c Add static-runtime configure argument
Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:27 +03:00
Simo Fält
00527b1fb4 Remove Conan provisioning script
It is breaking currently and it doesn't provide anything which IFW
would need.

Change-Id: Id2187fa98fb024921edeac9533396dd6caa27d37
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:25 +03:00
Simo Fält
66ed11f58b Install static version of OpenSSL to Windows
Building Qt with static runtime requires static libs of
OpenSSL.

Change-Id: Ifba2e88fefed341cafd804f29fe8dde7001eafa7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:22 +03:00
Simo Fält
9574f6ae66 Provisioning: Install prebuilt qdoc
Change-Id: I7991388b027bb8550618f5a2c78902dc98550c12
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:20 +03:00
Heikki Halmet
0607b95757 Provisioning: Activate SLES and enable modules
Pick-to: 5.12.7
Pick-to: 5.12.10
Task-number: QTQAINFRA-4437
Change-Id: Icfe15e028634eeef85671b2becefe98123f567f8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-03 08:19:57 +03:00
Liang Qi
77c6124574 provisioning: update python to 3.7 on macos
Task-number: QTQAINFRA-3271
Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ecf2f4f38c)
2021-04-29 07:06:03 +03:00
Heikki Halmet
81f028ea89 Provisioning: Upgrade python 3.6 version to 3.6.2 in Windows
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Pick-to: 5.12.10
Pick-to: 5.15
Task-number: QTQAINFRA-4433
Change-Id: Ifa9d45b4a3e06f4455221bb76087b600c1f1e06a
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-29 07:06:01 +03:00
Heikki Halmet
dc0ba63a36 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 26c97222c1)
2021-04-12 07:21:41 +03:00
Heikki Halmet
ba149a162b Provisioning: Reset Time Zone for macOS 10.13
Setting Time Zone for macOS 10.13 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-30 11:29:50 +03:00
Katja Marttila
e206ed1b37 IFW Coin: Build only release builds
Without the '-release' option IFW tools are built as debug. In
Windows it means unnecessary large installers and dependencies to msvc
debug libraries.

Change-Id: I3197216c91e82934ea11bdc3d635ce61516bc64e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 8da20a0a1b)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:04:29 +02:00
Simo Fält
5770eaaa52 Fix tqtc-installer-framework platform configs
Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 53680499c8)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:03:55 +02:00
Simo Fält
12b090a24c Fix installer configure args to create only release executables
Fixes: QTIFW-1999
Change-Id: I0efe695e8bdab9bc23e8122deb6b4e7f8aafa7bd
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 2d76b3d64d)
2021-03-03 09:03:51 +02:00
Iikka Eklund
351e5f2f5f Add platform config for tqtc-installer-framework
This is similar to installer-framework.yaml with added configurations
for QtInstaller specific builds.

This enables two sets of builds from the same branch of
tqtc-installer-framework.

First set is for plain tqtc-installer-framework builds
i.e. the commercial deliverable.

The "QtInstaller" set is for the consumption of Qt Installer
creation.

Task-number: QTIFW-1027
Change-Id: Ifff750eef2631ce4e16edb32a7f7df593c698944
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 307038829f)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:03:48 +02:00
Iikka Eklund
bc3e3ad85f Enable tests for installer-framework
Remove DisableTests feature from build configurations.

Task-number: QTIFW-1638
Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 5f1199953f)
2021-03-03 09:03:45 +02:00
Heikki Halmet
7e2fd354b0 Provisioning: Install Azure tool
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 883b9a4192)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:11:02 +00:00
Heikki Halmet
b9bb764e8d Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5888d1c9ba)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:58 +00:00
Heikki Halmet
8c83faf39e Provisioning: Remove brew cask list query
brew cask list --versions don't work anymore with macOS 10.13:
Calling brew cask list is disabled!

Change-Id: I44d64bea36577212d0d8ff1fbd4f40111b8cadee
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit e3c294489f)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:53 +00:00
Heikki Halmet
a3c179f754 Provisioning: Install p7zip using --build-from-source parameter
brew install p7zip isn't working anymore with macOS 10.13 and 10.12.
Let's use --build-from-source parameter with brew installation

Task-number: QTQAINFRA-4128
Change-Id: Ib1a2db1cd3176955cca450e5ebe0d0fc1bee3aa4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c470301c34)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:49 +00:00
Heikki Halmet
e41c48ebf8 Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
(cherry picked from commit 08a384605a)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:44 +00:00
Heikki Halmet
2baf83b180 Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature

Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d238c03742)
(cherry picked from commit 105f54c090)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:40 +00:00
Heikki Halmet
9c71fcd258 Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6d20944daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b66e4773c8)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:34 +00:00
Heikki Halmet
92ea8f4884 Provisioning: Latest pip versions don't support Python 2 anymore
We can't upgrade pip anymore to the latest version.
pip 20.3 was the last version of pip that supported Python 2

Task-number: QTQAINFRA-4235
Change-Id: I2add6939614f282416a39b00734bc1d22906de47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d6e3aa0869)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 17c654f600)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:29 +00:00
Heikki Halmet
b66e4773c8 Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6d20944daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-09 09:37:08 +00:00
Heikki Halmet
17c654f600 Provisioning: Latest pip versions don't support Python 2 anymore
We can't upgrade pip anymore to the latest version.
pip 20.3 was the last version of pip that supported Python 2

Task-number: QTQAINFRA-4235
Change-Id: I2add6939614f282416a39b00734bc1d22906de47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d6e3aa0869)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-09 09:37:06 +00:00
Heikki Halmet
d45b374657 Provisioning: Use prebuilt Android openssl if available
Android openssl configuration is flaky. Some cases it can't find perl.
Let's use prebuilt package from local cache. If not available then
download sources and configure it.

Task-number: QTQAINFRA-3993
Change-Id: I4b15cba763d88d85dfe7908fa22c2ce5f461f5cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 25dbd78d3f)
2021-01-24 09:53:01 +02:00
Heikki Halmet
105f54c090 Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature

Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d238c03742)
2021-01-20 20:17:04 +02:00
Heikki Halmet
e3c294489f Provisioning: Remove brew cask list query
brew cask list --versions don't work anymore with macOS 10.13:
Calling brew cask list is disabled!

Pick-to: 5.15
Pick-to: 5.12.7
Change-Id: I44d64bea36577212d0d8ff1fbd4f40111b8cadee
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-12 12:55:29 +02:00
Heikki Halmet
c470301c34 Provisioning: Install p7zip using --build-from-source parameter
brew install p7zip isn't working anymore with macOS 10.13 and 10.12.
Let's use --build-from-source parameter with brew installation

Pick-to: 5.12.7
Task-number: QTQAINFRA-4128
Change-Id: Ib1a2db1cd3176955cca450e5ebe0d0fc1bee3aa4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-12 12:55:28 +02:00
Heikki Halmet
5d4d997cbe Provisioning: Remove signing tools script
Tools aren't needed anymore

Change-Id: Iac4dd282dbbd67b62d843925751903e57c934000
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5d7dae8dcb)
2020-12-23 07:39:50 +02:00
Heikki Halmet
9a00450454 Update macOS 10.13 Tier1 image
Software updates are disabled from tier1 image.
It seems, that without this macOS 10.13 keep on crashing.
This is related to QTQAINFRA-4104

Change-Id: I92f0039102d93268358301bfb789765ca39fd1ae
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-18 15:48:04 +00:00
Heikki Halmet
883b9a4192 Provisioning: Install Azure tool
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-11 10:06:50 +00:00
Heikki Halmet
5888d1c9ba Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-11 10:06:49 +00:00
Heikki Halmet
9390cd1b70 Provisioning: Install Microsoft Visual C++ Redistributable
Script will install  Microsoft Visual C++ Redistributable for
Visual Studio 2015, 2017 and 2019

Change-Id: I4366855c8d5679e3b7b201d79a82e47199b3ad8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 01752b6e21)
2020-11-04 18:44:18 +02:00
Johanna Äijälä
3693ea212c Provisioning: update Squish installation to 6.6.1
Update Squish installation to Qt5.12 based Squish 6.6.1.
Also update scripts to the new style, where pre-installed
Squish archives are used. The old style did the Squish
installation from a scratch.

Change-Id: I298ecee5e66d48c9e02d2cd4bc8d01311df65261
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-03 07:29:49 +02:00
Heikki Halmet
08a384605a Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
2020-11-03 07:29:46 +02:00
Heikki Halmet
9de232ba66 Provisioning: Add system GCC versions to versions.txt
Currently GCC versions which comes with the system are missing from
versions.txt. This change will add those

Task-number: QTQAINFRA-3933
Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dff15e0a71)
2020-11-03 08:29:44 +03:00
Heikki Halmet
a7b8f5abd8 Provisioning: Retry python installation if failure occurs
Python installation is flaky and we haven't be able to determine the
root cause for it. Re-running the installation might help.
(Might) because we can't reproduce this manually.

Task-number: QTQAINFRA-3875
Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 6e3cb240df)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-03 08:29:42 +03:00
Heikki Halmet
26457902b1 Provisioning: Install colorlog
Needed by packaging scripts

Task-number: QTQAINFRA-3918
Change-Id: I30861ecb5f12f79683ad2fec58484b97dee31d7f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c053e70593)
2020-11-03 07:29:40 +02:00
Heikki Halmet
9616544a55 Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 586856e180)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-10-22 05:10:11 +00:00
Heikki Halmet
01752b6e21 Provisioning: Install Microsoft Visual C++ Redistributable
Script will install  Microsoft Visual C++ Redistributable for
Visual Studio 2015, 2017 and 2019

Change-Id: I4366855c8d5679e3b7b201d79a82e47199b3ad8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-10-22 08:10:06 +03:00
Heikki Halmet
3b07ea9741 Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 586856e180)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-10-21 23:52:37 +00:00
Heikki Halmet
448a19766e Provisioning: Enable access to SMB server
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3974
Change-Id: I5fd918882c51c01985cd4c1b9f9ed4dec62e07dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 90a6ab728f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-10-20 14:39:09 +00:00
Konstantin Tokarev
a825b4965d Provisioning: Update Conan to 1.29.0
Task-bumber: QTQAINFRA-3916
Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f73fa57088)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-02 17:12:28 +03:00
Heikki Halmet
c2877e7ea9 Provisioning: Disable unneeded services
To speed up things and release CPU we need to disable
unneeded services

Change-Id: I067ad6eb0b3b5df72edc00aa244cc1bff35c4232
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-02 14:12:24 +00:00