This reverts commit 72f11e0952.
Reason for revert: WoA is not going be included in 6.7 and WoA target is blocking dd08ded0fc20f5fce10bf287d4d22ae026226717, -51 template will not work with the proxy enabled and -53 template brings error C2672 with its updated MSVC in 6.7 qtbase.
Task-number: QTQAINFRA-6111
Change-Id: I13fde01aba392b173db178bff6893b71c20ae98a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Packaging reported issue that python installation
without proxy didn't work - therefore enabling proxy
back was needed but with a fix to handle Py 3.10+ changes
Py 3.10+ pip 24.2 has moved to use system certifications
by default which caused issue when proxy is used
and if host didn't have one specific certification
GlobalSign Root CA - R3 for pypi.org.
Also noticed that sometimes Windows x64 images seemed to
have this missing certification, but after installing it
to Windows ARM (which was clearly missing it) - logs showed
they didn't have it - and direct check to both Win x64
Tier1 images showed that they didn't have that cert.
Not sure what steps in provisioning or proxy usage could have
affected to that, but missing certification is now added directly
to all of these new three Windows Tier 1 images:
- qtci-windows-10_22H2-x86_64-52 (via QTQAINFRA-6207)
- qtci-windows-11_23H2-x86_64-53
- qtci-windows-11_22H2-aarch64-53 (only to branches 6.8, 6.9)
Therefore --use-deprecated=legacy-certs flag is not needed
when system has correct certification available as Py 3.10+
has moved to use them by default.
Long-term improvements could still be added in future, in two ways:
1) Internal package cache (QTQAINFRA-6485 QTQAINFRA-5531), or
2) To update system certificates with Py 3.10+
But those will need more time to decide and implement.
Therefore this improved quick fix to get proxy back with Py 3.10+
was needed now and it removes previous quick fix to unset proxy.
Task-number: QTQAINFRA-6490
Task-number: QTQAINFRA-6473
Pick-to: 6.5 6.2
Change-Id: I0805a70cf1163012094505162d28640e9ea8e6bb
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 61c5bb072f)
(cherry picked from commit aa22a35f05)
qtci-windows-10_22H2-x86_64-51 was copied as -52
In this new tier-1 image, the following services were disabled:
- backgroundDownload.exe (part of MSVC)
- Microsoft Edge update/installer and Onedrive
Also missing certification GlobalSign Root CA - R3 was added.
Pick-to: 6.5 6.2
Task-number: QTQAINFRA-6207
Task-number: QTQAINFRA-6490
Task-number: QTQAINFRA-6473
Change-Id: Ifd51d25a6c8d43b008ca65af22ebbd592cf57b85
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d58045688b)
(cherry picked from commit 368369beb1)
There are no WoA versions of JDK builds available from Oracle but
Microsoft maintains a WoA compatible OpenJDK build.
This change also removes the registry edit to disable Java
auto-update as the auto-update function in Java no longer exists.
Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-6385
Change-Id: I672ef4ac7cbca3d62ecd6a646fd769aff1cad4c5
(cherry picked from commit b3f5b4fd64)
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Those will be provided by Coin.
Follow-up to 4e09a6db79 for macOS ARM.
Pick-to: 6.5 6.2
Change-Id: Iffe433b606e6fb28580b8d2a265ee82f4bda7eb8
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 73c8e4d387)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 55bef8cb0c)
It used to be installed as a dependency of some other package, but
stopped doing lately, which causes qtbase to build without zstd
support.
This change explicitly installs the libzstd-dev package to prevent
this from happening again.
Fixes: QTBUG-124787
Fixes: QTBUG-127644
Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 8ad05756ed)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c3a5651bd0)
Reviewed-by: Toni Saario <toni.saario@qt.io>
The pip3 install calls contained the word 'install' twice.
Starting with newer pip versions, this seems to fail with:
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install
virtualenv wheel html5lib
ERROR: Could not find a version that satisfies the requirement
install (from versions: none)
ERROR: No matching distribution found for install
Make sure install only appears once.
Pick-to: 6.8
Change-Id: I1bfc784d4e3d6a1c34d112e72e2739678d2f07ae
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 866b4cedaf)
This allows us to run unit tests that require real-world codecs on
debian/ubuntu
Pick-to: 6.5
Change-Id: I99a73506610ea430948692f8a88045394e747750
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 02af86d2aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6eed0ab93a)
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
The version variable that is used to define the packages to download was
updated to reflect the new version.
A new case was added for the new "Debian11" on "arm64" package which was
not a provisioned package on older version but is now provided.
As "Debian11" was not currenly loading "libclang.sh", a new script that
performs this process was added to
"coin/provisioning/qtci-linux-Debian-11.6-aarch64".
The newly sourced "libclang.sh" includes
"coin/provisiong/common/unix/common.sourced.sh", which sets up certain
common variables such as the used architecture and the platform id.
When "common.sourced.sh" sets "PROVISION_ARCH", that contains the
current platform architecture, it fails if the platform architecture is
not supported.
For "Debian11" on "arm64", the architecture, as reported by "uname -m"
is "aarch64", which is equivalent to "arm64".
"aarch64" was not handled by the script, so that a platform with that
architecture would result in a fail when sourcing "common.sourced.sh".
To avoid the failure, the case that sets "PROVISIONING_ARCH" to "arm64"
will not trigger when the reported architecture is "aarch64".
The specialized RedHat case was update to work specifically for version
9, to use the new specifically built package for Rhel9.2.
The default case, previously using an "ubuntu20.04" package, was
modified to use a "Rhel8.8" package.
A package for "Ubuntu20.04" is not currently provided anymore as the
platform was removed from CI and the new "22.04" package is not
compatible with all the platforms that would use it.
In particular, the new packages are built on a too new glibc, which will
then fail to link, due to undefined symbols in the produced Clang
libraries, when used on older-glibc platforms such as "OpenSuse15" and
"Rhel8.8".
The "Rhel8.8" package was specifically used as the platform for the
default package as it ships the older glibc, "2.28", of the supported
platforms, which should ensure that it works on the older-version platforms.
The "sha1" variables for cached downloads was updated to reflect the new
packages.
For provisioning on windows, the version variable and the sha1 variables
were updated to reflect the new version and the new packages, respectively.
Task-number: QTBUG-111580
Task-number: QTBUG-121548
Change-Id: Ie7c1a8d8fe9114912d53a87f70ebfa00341a9d8a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 9975595a5e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1b97371ea0)
Install the ARM sccache binary to fix
/usr/local/sccache/sccache: Bad CPU type in executable
Change-Id: I033a7c8cf88d0d1ad35a4406a5d2a878da8d17a7
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c872c35cc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 91c649c20e)
Fix CMAKE_SYSTEM_PROCESSOR definition for armv7le. This is needed when
using Windows host to cross-compile Qt binaries for QNX.
Fixes: QTBUG-125450
Pick-to: 6.5
Change-Id: I19df2ef9d4cc988f5acf4f09fa46b7014fac80d2
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e560e22a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f042009b4d)
Introduce GetVsProperty helper function that allows to retrieve Visual
Studio installation property by providing required component (optional).
It also offers the ability to choose which version of Visual Studio to
use (the oldest or the newest). Also add GetVsInstallationPath helper
function which is a handy shortcut to retrieve installation path
property.
Pick-to: 6.5
Change-Id: I90afca74db9a6f87b622c7fafec2243e085e89e0
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 71b10bfe48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f956053d4c)
- We don't need to duplicate msvc2019 packaging build to windows 11;
it is already done and packaged from Windows 10 ->
drop windows-11_22h2-msvc2019, windows-11_23H2-msvc2019
- We have windows-11_23h2-msvc2022 and so on we don't need
windows-10_22h2-msvc2022 or windows-11_22h2-msvc2022
- We have windows-10_22h2-msvc2019-developer-build and so on we don't need windows-11_23h2-msvc2019-developer-build or windows-11_22h2-msvc2019-developer-build
- We have windows-10_22h2-msvc2019-arm64, which is used as a packaging target so we don't need windows-11_22h2-msvc2019-arm64 or windows-11_23H2-msvc2019-arm64
- We have windows-11_23h2-llvm, which is a packaging target so we don't need windows-10_22h2-llvm or windows-11_22h2-llvm
- We have windows-11_23H2-mingw11-developer-build and so on we don't need windows-10_22h2-mingw11-developer-build or windows-11_22h2-mingw11-developer-build
Change-Id: Ic406288fa989b1cb8d90c0d502dd93c166c2af14
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Visual Studio 2022 is the first msvc having natively support for
building and debugging ARM64 apps.
Provisioning needed to take new Get-CpuArchitecture
helpers.ps1 function into use in several installations.
Requirements for other branches
- Get-CpuArchitecture helpers.ps1 function
- Skip qtwebengine with Windows 11 ARM (QTBUG-124632)
List of excluded installations in Windows on ARM:
- Could be added later
- MinGW - QTQAINFRA-6079
- DirectX SDK for RTA
- libclang
- mcuexpresso
- fbx for msvc2022
- Ruby
- For python
- conan
- emsdk
- Not supported yet
- FFmpeg
- Msys2 (for FFmpeg QTBUG-124399)
- MySQL
- PostgreSQL
- Java JDK
- Strawberry Perl
Task-number: QTQAINFRA-6111
Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-5855
Change-Id: I4130e78add53f8a6e05eb41b7617b3f9ca802178
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
For the addition of ARM64 to our checked packages, this helper function
will come in handy as it is more fine grained than Is64BitHost.
Change-Id: I8956c1ca6e445c0b783a39e4d42069199496f053
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8fae627f8b)
This isn't supported for a longer time now.
Pick-to: 6.6
Change-Id: Id10fb6c73459e5f10f854b417af6b14eec2e0f78
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 7bc8bfbf18)
Windows is most picky wrt exporting/symbol resolution,
so it is a good platform to do a build check without tests.
Pick-to: 6.6
Change-Id: I477e20f8c8bf16e1206082ae0c2b3960c902989a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit dec2de7b82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Gradle 8 and AGP 8+ require JDK version 17 to work properly, this is
needed for CI test runs of Android.
Task-number: QTBUG-106907
Change-Id: I437ee6752fe12ce4d40fbfe1af2bfff1b4ca243b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 31d72b0e2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
No need to wrap the sed call in a shell, just invoke sed directly.
And reduce the two separate sed invocations to one with two file arguments.
This change is purely aesthetic, functionality should be identical.
Pick-to: 6.5
Change-Id: If841301077e1c21fe846b28b5f7f6af422d86b93
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 5f3586f59f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This feature turns off clang-support for lupdate.
Task-number: QTBUG-123611
Task-number: QTQAINFRA-6244
Change-Id: I192b711b6a310e3dd1da3fefe2ca0c8fb732a01c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c8a236e858)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This change removes 'InsignificantTests' feature from Windows 11 23H2
platform configurations.
Also add 'Packaging' to windows-11_23H2-msvc2022 target
Task-number: QTQAINFRA-6244
Task-number: QTQAINFRA-6075
Task-number: QTBUG-124244
Change-Id: I8ddb9dfa45199982511f46841d1be30757055b25
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit dc919e14d8)
Windows 11 23H2 version which will replace Windows 11 22H2 once the
new version is deemed as stable. Until then, 23h2 tests will be set
as insignificant.
Task-number: QTQAINFRA-6075
Task-number: QTQAINFRA-6244
Change-Id: I15054813896210fadf14da815ad5a7b3e402e800
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 5157d1ef93)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Qt 6.7 has the minimum supported Android version as 8, this applies
that to the CI as well.
Task-number: QTBUG-111919
Change-Id: Id4c9eda29f1b61bf739eae3624b07f44a893cfae
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 2d7f6760dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Android 13 system image was still being downloaded and an emulator
created for it while it's not being used in CI, so it's just adds
unnecessary load to provisioning.
Change-Id: Ie33c82fd578dcfe68a77426c8e5c0cf047938833
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3d69ad8d8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
If Gradle is not present in the system, it's downloaded from the URL
from the Gradle wrapper. Also, the same for AGP when an Android
project build is done. Currently, that's done on every integration,
and that can be unreliable due to networking flakiness. With this
patch, a Gradle build is done once during provisioning where the
downloads of Gradle and AGP dependencies are downloaded.
Fixes: QTQAINFRA-6166
Fixes: QTQAINFRA-4726
Fixes: QTBUG-117203
Fixes: QTBUG-114699
Change-Id: Ic9fd8aeea3379ca1d45ffeb4523a52e2846fcabb
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 39517ef0d0)
Was previously only added for 8.4 and 9.0
Pick-to: 6.5
Change-Id: Ifa22b6836818ad59b6f3dcfd6b1a6dbc1293782b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ee56a3b8ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Update to latest (as of now) Android emulator version 34.1.19, which
might solve Vulkan crashes on some CI tests.
Pick-to: 6.6 6.5
Task-number: QTQAINFRA-5971
Change-Id: Ic81158f44ac5c922bfdbe6f5c04900234e063615
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit a9f16c0abd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Task-number: QTQAINFRA-5831
Change-Id: Ibdd2360a55855d04bf02d6047870f48319c2ce9d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 9ceb1b5ef5)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
The bootstrap-agent is the 'responsible process' in TCC terms when
it comes to whether a test should be allowed to access the microphone.
https://www.qt.io/blog/the-curious-case-of-the-responsible-process
By giving this process the permission explicitly, by modifying the
TCC database, we ensure that all tests run as child processes also
get this permission.
Change-Id: Ia03084ac89f0717ac6457b0035769f4a9863495b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit b4de4de742)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Allows us to first see tart on production load before starting to
move the blocking arm targets to tart. Later configs will be
directly replaced and original ids will be used.
Change-Id: I865e6fe46b61828b6123b69973a2a4d209697c5f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit dffc3dd7df)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
