macOS ARM, Python: Combine Python provisioning into common script

The Python provisioning on macOS ARM hosts is done multiple times
across separate targets.

This patch moves the code into a common script 'macos/python-arm.sh'.
As a drive-by, we bump the version of all targets to 3.12.11, whch is
the same as the one used in the macOS 15 ARM host.

Pick-to: 6.10 6.8
Change-Id: I8c1f6f7d635fe47b9faa34dbe6988e89252dc2c9
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f0b54a51f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.11
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,107 +252,107 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
+	branch = 6.11
 	status = preview

cmake/QtIRCommandLineHelpers.cmake

@@ -421,3 +421,19 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
     endif()
     set(${out_var} "${cmake_option}" PARENT_SCOPE)
 endfunction()
+
+# Get the value of a command line option as existing absolute path.
+# Yield error if the path does not exist.
+# Convert to absolute path if necessary.
+function(qt_ir_get_option_as_existing_absolute_path name value)
+    qt_ir_get_option_value("${name}" path)
+    if(NOT "${path}" STREQUAL "")
+        if(NOT EXISTS "${path}")
+            qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
+        endif()
+        if(NOT IS_ABSOLUTE "${path}")
+            get_filename_component(path "${path}" ABSOLUTE)
+        endif()
+    endif()
+    set("${value}" "${path}" PARENT_SCOPE)
+endfunction()

cmake/QtIRHelpers.cmake

@@ -295,7 +295,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
         "${working_directory}")
 
     # Get some additional options to pass down.
-    qt_ir_get_option_value(alternates alternates)
+    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
     qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
 
     # The prefix for the cmake-style 'dictionary' that will be used by various functions.

coin/platform_configs/nightly_cxx23.yaml

@@ -26,14 +26,3 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]
-# Test clang-20 on Ubuntu 24.04 ARM64 Wayland
--
-    Id: 'ubuntu-24.04-arm64-clang20-cxx23'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput -c++std c++23'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20',
-        'CMAKE_ARGS=-DQT_FEATURE_stdlib_libcpp=ON'
-    ]

coin/platform_configs/qt-creator.yaml

@@ -9,7 +9,7 @@ Configurations:
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -21,7 +21,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-15-arm-104'
     Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -43,17 +43,30 @@ Configurations:
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
+    Configure arguments: ''
+    Environment variables: []
+-
+    Template: 'qtci-macos-15-arm-104'
     Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
+# Tests GCC 11
+-
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
+    Configure arguments: ''
+    Environment variables: []
 # license check
 -
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'

coin/provisioning/common/macos/python-arm.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2017 Pelagicore AG
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script installs python3 on macOS ARM hosts.
+
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+# Use 3.12 as a default python
+# Note: Make sure that it's a version where dependencies are stored in CI-files.
+python_ver="3.12.11"
+
+export PYTHON_BUILD_MIRROR_URL="https://ci-files01-hki.ci.qt.io/input/python/"
+export PYTHON_BUILD_MIRROR_URL_SKIP_CHECKSUM=1
+pyenv install "$python_ver"
+
+/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../shared/requirements.txt
+
+SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
+SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
+SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
+
+# Provisioning during installation says:
+# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
+# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
+SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
+
+# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
+SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/python3"
+
+echo "python3 = $python_ver" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-clang.sh

@@ -14,4 +14,11 @@ curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
 sudo apt-add-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main'
 
 sudo apt update
-sudo apt -y install clang-20 lldb-20 lld-20 libc++-20-dev
+sudo apt -y install clang-20 lldb-20 lld-20
+
+# note: installing the libc++ development files conflicts with libgstreamer1.0-dev
+# * installing libunwind-20-dev from apt.llvm.org (as dependency of libc++-20-dev) will
+#   uninstall libgstreamer1.0-dev
+# * installing libunwind-20-dev from the Ubuntu repository will break gstreamer's pkg-config
+#   integration: https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-20/+bug/2134518
+# sudo apt -y libc++-20-dev

coin/provisioning/qtci-macos-11-arm/25-python3.sh

@@ -3,18 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.9.7
-
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-echo "python3 = 3.9.7" >> ~/versions.txt

coin/provisioning/qtci-macos-12-arm/25-python.sh

@@ -3,27 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.9.7
-
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-# Provisioning during installation says:
-# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
-# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
-
-# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
-SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
-
-echo "python3 = 3.9.7" >> ~/versions.txt

coin/provisioning/qtci-macos-13-arm/25-python.sh

@@ -3,27 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.9.7
-
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-# Provisioning during installation says:
-# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
-# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
-
-# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
-SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
-
-echo "python3 = 3.9.7" >> ~/versions.txt

coin/provisioning/qtci-macos-14-arm/25-python.sh

@@ -3,27 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.9.7
-
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-# Provisioning during installation says:
-# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
-# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
-
-# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
-SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
-
-echo "python3 = 3.9.7" >> ~/versions.txt

coin/provisioning/qtci-macos-15-arm/25-python.sh

@@ -3,27 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.12.11
-
-/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-# Provisioning during installation says:
-# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
-# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
-
-# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
-SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/python3"
-
-echo "python3 = 3.12.11" >> ~/versions.txt

coin/provisioning/qtci-macos-26-arm/25-python.sh

@@ -3,27 +3,7 @@
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs python3
+set -euox pipefail
 
-# shellcheck source=../common/unix/SetEnvVar.sh
+# shellcheck source=../common/macos/python-arm.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
-
-pyenv install 3.9.7
-
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-
-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-# Use 3.9 as a default python
-SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
-
-# Provisioning during installation says:
-# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
-# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
-
-# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
-SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
-
-echo "python3 = 3.9.7" >> ~/versions.txt

tests/manual/RunCMake/ConfigureBuildQt/Utils.cmake

@@ -246,16 +246,22 @@ function(setup_qt_sources)
 
     set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${working_dir}")
 
-    set(code_qt_io_mirror "https://code.qt.io/qt/qt5.git")
     set(gerrit_mirror "https://codereview.qt-project.org/qt/qt5")
+    get_repo_base_url(ci_repo_base_url)
+    set(remote_clone_url "${ci_repo_base_url}/qt/qt5.git")
 
     # Make a copy of the qt6 repo on which the test will operate on.
-    # On the CI we clone it from the official mirror, because we don't have a git repo, but only
+    # On the CI we clone qt6 from one of the following sources, in order:
-    # a source archive.
+    # - the Coin CI git mirror
-    # On a local build we use the current qt6 checkout.
+    # - or the remote specified by QT_CI_BUILD_QT_GIT_REMOTE
+    # - or from code.qt.io
+    # We do a clone, because 'local_clone_url' is usually not a git repo in the CI,
+    # but only a source archive.
+    # On a local build where a ci_ref is not specified, we use the current qt6 checkout
+    # from 'local_clone_url'.
     set(ci_ref "$ENV{TESTED_MODULE_REVISION_COIN}")
     if(ci_ref)
-        set(final_clone_url "${code_qt_io_mirror}")
+        set(final_clone_url "${remote_clone_url}")
     else()
         set(final_clone_url "${local_clone_url}")
     endif()
@@ -295,9 +301,7 @@ function(setup_qt_sources)
             SYMBOLIC)
         endforeach()
     else()
-        # Adjust its remote url not to be the local url.
+        # Adjust its remote url to be the chosen mirror rather the local url.
-        get_repo_base_url(repo_base_url)
-        set(remote_clone_url "${repo_base_url}/qt/qt5.git")
         run_command("${prefix}" set_remote_url git remote set-url origin "${remote_clone_url}")
 
         # Sync to given module.

tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt

@@ -1,7 +1,7 @@
 \+ git submodule init qtsvg
-Submodule 'qtsvg' \(https://code.qt.io/qt/qtsvg.git\) registered for path 'qtsvg'
+Submodule 'qtsvg' \(.+/qtsvg.git\) registered for path 'qtsvg'
 \+ git config commit.template .+tmp.+/qt6/.commit-template
-\+ git clone --no-checkout https://code.qt.io/qt/qtsvg.git qtsvg
+\+ git clone --no-checkout .+/qt/qtsvg.git qtsvg
 Cloning into 'qtsvg'...
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git

tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt

@@ -1,6 +1,6 @@
 \+ git submodule init qtsvg
 \+ git config commit.template .+tmp.+/qt6/.commit-template
-\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
+\+ git config remote.origin.url .+/qt/qtsvg.git
 \+ git fetch origin
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git

tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt

@@ -1,12 +1,12 @@
 \+ git submodule init qtshadertools qtsvg
-Submodule 'qtshadertools' \(https://code.qt.io/qt/qtshadertools.git\) registered for path 'qtshadertools'
+Submodule 'qtshadertools' \(.+/qt/qtshadertools.git\) registered for path 'qtshadertools'
 \+ git config commit.template .+tmp.+/qt6/.commit-template
-\+ git clone --no-checkout https://code.qt.io/qt/qtshadertools.git qtshadertools
+\+ git clone --no-checkout .+/qt/qtshadertools.git qtshadertools
 Cloning into 'qtshadertools'...
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtshadertools.git
 \+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
-\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
+\+ git config remote.origin.url .+/qt/qtsvg.git
 \+ git fetch origin
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git

tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt

@@ -1,24 +1,24 @@
 \+ git config --get initrepository.initialized
 \+ git submodule init qtshadertools qtsvg qtactiveqt qttools
-Submodule 'qtactiveqt' \(https://code.qt.io/qt/qtactiveqt.git\) registered for path 'qtactiveqt'
+Submodule 'qtactiveqt' \(.+/qt/qtactiveqt.git\) registered for path 'qtactiveqt'
-Submodule 'qttools' \(https://code.qt.io/qt/qttools.git\) registered for path 'qttools'
+Submodule 'qttools' \(.+/qt/qttools.git\) registered for path 'qttools'
 \+ git config commit.template .+tmp.+/qt6/.commit-template
-\+ git config remote.origin.url https://code.qt.io/qt/qtshadertools.git
+\+ git config remote.origin.url .+/qt/qtshadertools.git
 \+ git fetch origin
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtshadertools.git
 \+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
-\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
+\+ git config remote.origin.url .+/qt/qtsvg.git
 \+ git fetch origin
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git
 \+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
-\+ git clone --no-checkout https://code.qt.io/qt/qtactiveqt.git qtactiveqt
+\+ git clone --no-checkout .+/qt/qtactiveqt.git qtactiveqt
 Cloning into 'qtactiveqt'...
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtactiveqt.git
 \+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
-\+ git clone --no-checkout https://code.qt.io/qt/qttools.git qttools
+\+ git clone --no-checkout .+/qt/qttools.git qttools
 Cloning into 'qttools'...
 \+ git config commit.template .+tmp.+/qt6/.commit-template
 \+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qttools.git
@@ -29,8 +29,8 @@ Submodule path 'qtshadertools': checked out '[0-9a-zA-Z]+'
 Submodule path 'qtsvg': checked out '[0-9a-zA-Z]+'
 Submodule path 'qttools': checked out '[0-9a-zA-Z]+'
 \+ git submodule init src/assistant/qlitehtml
-Submodule 'src/assistant/qlitehtml' \(https://code.qt.io/playground/qlitehtml.git\) registered for path 'src/assistant/qlitehtml'
+Submodule 'src/assistant/qlitehtml' \(.+/playground/qlitehtml.git\) registered for path 'src/assistant/qlitehtml'
-\+ git clone --no-checkout https://code.qt.io/playground/qlitehtml.git src/assistant/qlitehtml
+\+ git clone --no-checkout .+/playground/qlitehtml.git src/assistant/qlitehtml
 Cloning into 'src/assistant/qlitehtml'...
 \+ git submodule update --force --no-fetch
 Submodule path 'src/assistant/qlitehtml': checked out '[0-9a-zA-Z]+'

tests/manual/RunCMake/InitRepository/RunCMakeTest.cmake

@@ -109,13 +109,27 @@ function(run_suite)
     set(code_qt_io_mirror "https://code.qt.io/qt/qt5.git")
     set(gerrit_mirror "https://codereview.qt-project.org/qt/qt5")
 
+    set(coin_git_ip_port "$ENV{QT_COIN_GIT_DAEMON}")
+    set(ci_mirror "git://${coin_git_ip_port}/qt-project")
+    set(ci_clone_url "${ci_mirror}/qt/qt5.git")
+
+    if(coin_git_ip_port)
+        set(remote_clone_url "${ci_clone_url}")
+    else()
+        set(remote_clone_url "${code_qt_io_mirror}")
+    endif()
+
     # Make a copy of the qt6 repo on which the test will operate on.
-    # On the CI we clone it from the official mirror, because we don't have a git repo, but only
+    # On the CI we clone qt6 from one of the following sources, in order:
-    # a source archive.
+    # - the Coin CI git mirror
-    # On a local build we use the current qt6 checkout.
+    # - or from code.qt.io
+    # We do a clone, because 'local_clone_url' is usually not a git repo in the CI,
+    # but only a source archive.
+    # On a local build where a ci_ref is not specified, we use the current qt6 checkout
+    # from 'local_clone_url'.
     set(ci_ref "$ENV{TESTED_MODULE_REVISION_COIN}")
     if(ci_ref)
-        set(final_clone_url "${code_qt_io_mirror}")
+        set(final_clone_url "${remote_clone_url}")
     else()
         set(final_clone_url "${local_clone_url}")
     endif()
@@ -129,8 +143,7 @@ function(run_suite)
         run_suite_command(0012_checkout_ci_qt6_ref git checkout FETCH_HEAD --quiet)
     endif()
 
-    # Adjust its remote url to be the official mirror rather the local url.
+    # Adjust its remote url to be the chosen mirror rather the local url.
-    set(remote_clone_url "${code_qt_io_mirror}")
     run_suite_command(0020_set_qt6_remote_url git remote set-url origin "${remote_clone_url}")
 
     # Ignore certain lines