Provisioning: Disable keyring password prompt

Fixes: QTQAINFRA-6215
Pick-to: 6.5
Change-Id: I50e70177f763493107d0919625f4885dc3a9713d
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 1716158656)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1f69b89aff)

.gitmodules

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

_clang-format

@@ -28,8 +28,8 @@ CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
 
-# We generally use "template <" with space.
-SpaceAfterTemplateKeyword: true
+# We use template< without space.
+SpaceAfterTemplateKeyword: false
 
 # We want to break before the operators, but not before a '='.
 BreakBeforeBinaryOperators: NonAssignment
@@ -106,9 +106,3 @@ AlignEscapedNewlines: Left
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false
 
----
-# Use the Google-based style for .proto files.
-Language: Proto
-BasedOnStyle: Google
-IndentWidth: 4
-ColumnLimit: 100

cmake/QtSortModuleDependencies.cmake

@@ -1,13 +0,0 @@
-# The script produces the list of qt submodules that are required to build the submodules listed
-# in the QT_BUILD_SUBMODULES variable. The resulting list preserves the required build order.
-# Usage:
-# cmake [-DQT_BUILD_SUBMODULES="<repo;..>"] [-BUILD_<repo>=<TRUE|FALSE>] \
-#    -P <path/to>/qt6/cmake/QtSortModuleDependencies.cmake
-cmake_minimum_required(VERSION 3.16)
-
-include(${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake)
-
-qt_internal_collect_modules_only(result "${QT_BUILD_SUBMODULES}")
-
-list(JOIN result " " result)
-message("${result}")

cmake/QtTopLevelHelpers.cmake

@@ -505,41 +505,3 @@ function(qt_internal_foreach_repo_run)
     )
     message("Successes: ${count_success}")
 endfunction()
-
-# The function collects repos and dependencies that are required to build
-# repos listed in ARGN. If the BUILD_<repo> is defined the 'repo' will be
-# excluded from the list.
-function(qt_internal_collect_modules_only out_repos)
-    set(initial_modules "${ARGN}")
-    get_filename_component(qt5_repo_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-
-    # Overriding CMAKE_CURRENT_SOURCE_DIR is ugly but works
-    set(CMAKE_CURRENT_SOURCE_DIR "${qt5_repo_dir}")
-    if(NOT initial_modules)
-        qt_internal_find_modules(initial_modules)
-    endif()
-
-    qt_internal_sort_module_dependencies("${initial_modules}" ${out_repos})
-    foreach(module IN LISTS ${out_repos})
-        # Check for unmet dependencies
-        if(DEFINED BUILD_${module} AND NOT BUILD_${module})
-            list(REMOVE_ITEM ${out_repos} ${module})
-            continue()
-        endif()
-        get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
-        get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
-        foreach(dep IN LISTS dependencies)
-            set(required FALSE)
-            if(dep IN_LIST required_deps)
-                set(required TRUE)
-            endif()
-            if(required AND DEFINED BUILD_${dep} AND NOT BUILD_${dep})
-                set(BUILD_${module} FALSE)
-                list(REMOVE_ITEM ${out_repos} ${module})
-                break()
-            endif()
-        endforeach()
-    endforeach()
-
-    set(${out_repos} "${${out_repos}}" PARENT_SCOPE)
-endfunction()

coin/platform_configs/address_sanitizer_platforms.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'opensuse-15.5-host-asan'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
     Configure arguments: '-nomake examples -developer-build'

coin/platform_configs/boot2qt-manifest.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/cmake_platforms.yaml

@@ -2,7 +2,6 @@ Version: 2
 Include: [
     cmake_platforms_qemu.yaml,
     cmake_platforms_qemu_qnx710.yaml,
-    cmake_platforms_qemu_vxworks.yaml,
     cmake_platforms_target_android.yaml,
     cmake_platforms_wasm.yaml,
     macos.yaml
@@ -13,8 +12,8 @@ Configurations:
     Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
     Id: 'ubuntu-22.04'
@@ -31,7 +30,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly']
+    Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
@@ -41,7 +40,7 @@ Configurations:
     Platform dependency: 'ubuntu-22.04'
 -
     Id: 'opensuse-15.5-developer-build'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-nomake examples -developer-build'
@@ -69,7 +68,7 @@ Configurations:
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
@@ -80,7 +79,7 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
@@ -92,7 +91,7 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
@@ -104,7 +103,7 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
@@ -116,7 +115,7 @@ Configurations:
     Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
@@ -144,7 +143,7 @@ Configurations:
     Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
@@ -169,7 +168,7 @@ Configurations:
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
 -
     Id: 'rhel-9.2'
@@ -181,16 +180,27 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
+# Build on Debian-11.6 and split test on Wayland and offscreen later
 -
     Id: 'debian-11.6-arm64'
     Template: 'qtci-linux-Debian-11.6-aarch64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
     ]
-
+# Test on Debian-11.6 offscreen
+-
+    Id: 'debian-11.6-arm64-offscreen-tests'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'InsignificantTests', 'TestOnly']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'QT_QPA_PLATFORM=offscreen'
+    ]
+    Platform dependency: 'debian-11.6-arm64'
 -
     Id: 'ios-universal'
     Template: 'qtci-macos-13-x86_64-103'
@@ -199,7 +209,7 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
@@ -213,7 +223,7 @@ Configurations:
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
@@ -226,7 +236,7 @@ Configurations:
     Environment variables: [
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
@@ -234,12 +244,12 @@ Configurations:
     Id: 'windows-11_22h2-llvm'
     Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'Clang'
-    Features: ['Packaging','Sccache', 'UseConfigure']
+    Features: ['Sccache', 'UseConfigure']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
     Environment variables: [
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
@@ -252,7 +262,7 @@ Configurations:
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
@@ -265,7 +275,7 @@ Configurations:
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
@@ -275,10 +285,11 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.7_dev',
+        'DEBIAN_RULES_REF=6.6_dev',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
+        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
 -
     Id: 'focal-amd64-debian-pkg-packaging'
@@ -286,9 +297,9 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.7_dev',
+        'DEBIAN_RULES_REF=6.6_dev',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
-
+        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]

coin/platform_configs/cmake_platforms_qemu_vxworks.yaml

@@ -1,15 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'vxworks-imx6'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'Insignificant', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
-    ]

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -8,7 +8,7 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
@@ -23,7 +23,7 @@ Configurations:
     Compiler: 'Mingw'
     Target compiler: 'Clang'
     Platform dependency: 'windows-10_22h2-mingw11'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
@@ -39,27 +39,27 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_api_23'
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}}',
+        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'android-14-x86_64-on-linux'
+    Id: 'android-13-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_34'
+        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
     ]

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'webassembly-linux-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Platform dependency: 'opensuse-15.5-developer-build'
@@ -28,11 +28,12 @@ Configurations:
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
     ]
 -
-    Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
+    Id: 'webassembly-macos-thread'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.5-developer-build'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',

coin/platform_configs/integrity.yaml

@@ -6,7 +6,7 @@ Configurations:
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
       Platform dependency: 'ubuntu-22.04'
-      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure', 'Insignificant']
+      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
       Environment variables: [
           'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
           'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',

coin/platform_configs/linux_android_tests_developer.yaml

@@ -13,5 +13,4 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
-        'ANDROID_EMULATOR=emulator_x86_api_23']
+        'ANDROID_EMULATOR=@emulator_x86_api_23']

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -10,11 +10,10 @@ Configurations:
     Platform dependency: [
         'rhel-8.8',
         'android-6-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-13-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
-        'WarningsAreErrors',
         'AndroidTestRun',
         'MinimalAndroidMultiABITests',
         'InstallDepsPerPlatformSubdir'
@@ -22,7 +21,7 @@ Configurations:
     Environment variables: [
         'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
         'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
-        'ANDROID_EMULATOR=emulator_x86_api_23'
+        'ANDROID_EMULATOR=@emulator_x86_api_23'
     ]

coin/platform_configs/macos.yaml

@@ -35,14 +35,30 @@ Configurations:
 
     # Test on all supported macOS versions (deployment targets)
 
-    # On x86_64
-
     -
         Id: 'macos-11-x86_64-tests'
         Template: 'qtci-macos-11-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-11-arm64-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-12-arm64-tests'
+        Template: 'qtci-macos-12-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-13-arm64-tests'
+        Template: 'qtci-macos-13-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-106'
@@ -55,36 +71,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-14-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-
-    # And arm64
-
-    -
-        Id: 'macos-12-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-14-arm64-tests'
-        Template: 'qtci-macos-14-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-
-    # Test the universal packaging built on arm64
-
     -
         Id: 'macos-12-arm-on-arm64-tests'
         Template: 'qtci-macos-12-arm64'
@@ -103,13 +89,6 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-14-arm-on-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-
     # =========================================================================
     # Developer build. Single architecture builds.
     # =========================================================================
@@ -134,10 +113,11 @@ Configurations:
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
         ]
+        # Note: We do not include OpenSSL or PostgreSQL in this build,
+        # as the M1 CI machines are not provisioned for that yet.
 
     # Test on all supported macOS versions (deployment targets)
 
@@ -159,9 +139,3 @@ Configurations:
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-13-arm64-developer-build'
-    -
-        Id: 'macos-14-arm64-developer-build-tests'
-        Template: 'qtci-macos-14-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-13-arm64-developer-build'

coin/platform_configs/meta-boot2qt-aws.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-boot2qt-qcom.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-qsr.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/nightly_macos13.yaml

@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Include: [
+    macos.yaml: [
+        "macos-12-x86_64-developer-build"
+    ]
+]
+Configurations:
+-
+    Id: 'macos-13-x86_64-developer-build-tests'
+    Template: 'qtci-macos-13-x86_64-103'
+    Compiler: 'Clang'
+    Features: ['TestOnly']
+    Platform dependency: 'macos-12-x86_64-developer-build'

coin/platform_configs/nightly_macos14_arm.yaml

@@ -1,20 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
--
-    Id: 'macos-14-arm64-developer-build'
-    Template: 'qtci-macos-14-arm64'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
-    ]
--
-    Id: 'macos-14-arm64-developer-build-tests'
-    Template: 'qtci-macos-14-arm64'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'macos-14-arm64-developer-build'

coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml

@@ -9,5 +9,5 @@ Configurations:
     Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]

coin/platform_configs/nightly_vxworks.yaml

@@ -1,11 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-    cmake_platforms.yaml: [
-        "ubuntu-22.04"
-    ],
-    cmake_platforms_qemu_vxworks.yaml: [
-        "vxworks-imx6"
-    ]
-]
-Configurations: []

coin/platform_configs/qt-creator.yaml

@@ -15,6 +15,12 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
+-
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Configure arguments: ''
+    Environment variables: []
 -
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/qt5.yaml

@@ -2,4 +2,14 @@ Version: 2
 Include: [
     cmake_platforms.yaml
 ]
-Configurations: []
+Configurations:
+# Test on Debian-11.6 Wayland
+-
+    Id: 'debian-11.6-arm64-wayland-tests'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
+    ]
+    Platform dependency: 'debian-11.6-arm64'

coin/platform_configs/qtapplicationmanager.yaml

@@ -1,13 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Id: 'ubuntu-22.04-axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DisableTests','Axivion_qtapplicationmanager', 'Insignificant', 'VMSize8']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+Configurations: []

coin/platform_configs/qtbase.yaml

@@ -5,7 +5,6 @@ Include: [
     integrity.yaml,
     ios-tests.yaml,
     address_sanitizer_platforms.yaml,
-    linux_android_tests_multi_abi.yaml,
-    wasm_qtbase_tests.yaml
+    linux_android_tests_multi_abi.yaml
 ]
 Configurations: []

coin/platform_configs/qtdeclarative.yaml

@@ -3,7 +3,6 @@ Include: [
     cmake_platforms.yaml,
     integrity.yaml,
     ios-tests.yaml,
-    address_sanitizer_platforms.yaml,
     cmake_platforms_static_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtimageformats.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtinterfaceframework.yaml

@@ -1,13 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Id: 'ubuntu-22.04-axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DisableTests','Axivion_qtinterfaceframework', 'Insignificant', 'VMSize8']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+Configurations: []

coin/platform_configs/qtlanguageserver.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -37,9 +37,9 @@ Configurations:
     Compiler: 'GCC'
     Platform dependency: 'ubuntu-22.04'
     Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
-    Configure arguments: '-nomake examples -release -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
@@ -47,35 +47,5 @@ Configurations:
         'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
     ]
--
-    Id: 'Axivion-qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -no-dbus -nomake examples -qtlibinfix TestInfix',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-    ]
--
-    Id: "Axivion-integrity-arm64"
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Target os: 'INTEGRITY'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', 'VMSize16']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
-        'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
-        'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
-        'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
-        'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
-        'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
-        'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-    ]
+
 

coin/platform_configs/qtshadertools.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtsvg.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
     integrity.yaml
 ]
 Configurations: []

coin/platform_configs/qtwayland.yaml

@@ -8,7 +8,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-wayland-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-wayland-tests'
@@ -16,3 +16,13 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04'
+# Test on Debian-11.6 Wayland
+-
+    Id: 'debian-11.6-arm64-wayland-tests'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
+    ]
+    Platform dependency: 'debian-11.6-arm64'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -13,7 +13,7 @@ Include: [
         'android-arm64-on-macos',
         'android-armv7-on-windows',
         'android-6-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-13-x86_64-on-linux'
     ]
 ]
 Configurations:
@@ -25,27 +25,11 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33'
-    ]
--
-    Id: "automotive-android-10-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
+        'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
     ]

coin/platform_configs/tqtc-qtpip.yaml

@@ -1,12 +0,0 @@
-Version: 2
-Module only: true
-Include: [
-  cmake_platforms.yaml: [
-    "windows-10_22h2-msvc2019",
-    "rhel-8.8"
-  ],
-  macos.yaml: [
-    "macos-universal-on-x86_64"
-  ]
-]
-Configurations: []

coin/platform_configs/wasm_qtbase_tests.yaml

@@ -1,9 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'webassembly-linux-thread-asyncify-tests'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify'

coin/platform_configs/yocto.yaml

@@ -41,18 +41,3 @@ Configurations:
         Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
         Compiler: 'Yocto'
         Target arch: 'TARGET10'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET1'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET2'
-    -
-        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-        Compiler: 'Yocto'
-        Features: ['Insignificant']
-        Target arch: 'INSIGNIFICANT_TARGET3'

coin/pre-provisioning/qtci-linux-RHEL-9.2-x86_64/01-disable-automounting.sh

@@ -1,6 +1,43 @@
 #!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#############################################################################
+##
+## Copyright (C) 2023 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
 
 set -ex
 

coin/pre-provisioning/qtci-linux-openSUSE-15.5-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,6 +1,6 @@
 ### OpenSUSE Leap 15.5 ###
 ## KDE ##
-## In qtci-linux-openSUSE-15.5-x86_64-51 > Graphics Platform: X11 (System default) ##
+## In qtci-linux-openSUSE-15.5-x86_64-52 > Graphics Platform: X11 (System default) ##
 
 # Installation #
 Language: English (US)
@@ -17,19 +17,10 @@ Time Zone: UTC
 
 ## Configurations ##
 Before coin-setup add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-Download and run coin-setup binary - http://coin/coin/binary/linux_amd64/coin-setup
-YaST - System - Services Manager - Firewalld - Stop
-# enable ssh access
-sudo rcsshd start
+Download and run coin-setup binary - http://10.215.100.35/coin/binary/linux_amd64/coin-setup
+- If IP has changed and Coin name not visible to VM, check from Coin logs which IP works for VMs
 Workspace Behavior - Screen locking - Lock screen automatically - unselect options
 Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default)
-Add below to '$HOME/.config/autostart/coin-bootstrap-agent.desktop' if missing
-    [Desktop Entry]
-    Type=Application
-    Exec=/usr/bin/gnome-terminal -e "/home/qt/bootstrap-agent /dev/ttyS0"
-    Hidden=false
-    X-GNOME-Autostart-enabled=true
-    Name=Coin
 Notifications
     Critical notifications - unselect
     Low priority notifications - unselect
@@ -39,5 +30,6 @@ Notifications
 Display and Monitor - Display Configuration - 1280x800
 Power Management: Screen Energy Saving - unselect
                   Suspend Session - unselect
+YaST - Hardware - Sound - Add Dummy soundcard
 
 Reboot

coin/pre-provisioning/qtci-windows-10-x86/msvc2015.txt

@@ -1,7 +1,7 @@
 # Install visual studio 2015
 
 version = "2015 update 3"
-installer = "http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe"
+installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_x86_x64_web_installer_6846650.exe"
 # Select default values
 # Make sure these are selected:
     * All values from 'Universal Windows App Development Tools'

coin/pre-provisioning/qtci-windows-10-x86/msvc2017.txt

@@ -6,7 +6,7 @@
 $version = "2017"
 # Current version was manually upgraded from the installer
 $version_number = "15.9.21"
-$installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__1312218103.1526017942.exe"
+$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__1312218103.1526017942.exe"
 
 # Following components were selected from installer:
 # Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)

coin/pre-provisioning/qtci-windows-10-x86/msvc2017_build_tools.txt

@@ -7,4 +7,4 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
 
 $url_internal = https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
-$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_2017_version_15.0_x86_x64_10254482.exe"

coin/pre-provisioning/qtci-windows-10-x86/msvc2019.txt

@@ -3,11 +3,11 @@
 $version = "2019"
 # Current version was manually upgraded from the installer
 $version_number = "16.4.6"
-$installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe"
+$installer = "http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe"
 
 MSVC 2019 build tools (default installation, no additional selections).
     * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
     * Version: 16.4.6
 
 Installed MSVC-2019 Components:

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt

@@ -15,4 +15,4 @@ $installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_insta
 #   -Visual Studio Extensibility Tools Update 3
 
 # NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.ci.qt.io/input/windows/sdksetup.exe"
+$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt

@@ -7,7 +7,7 @@ $installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__5050
 
 MSVC 2019 build tools (default installation, no additional selections).
     * Install after MSVC2019 is installed!
-    * Installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
     * Version: 16.8.1
 
 Installed MSVC-2019 Components:

coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt

@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/msvc2019.txt

@@ -65,7 +65,7 @@ Windows 10 SDK (10.0.20348.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.2 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.2 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H1-x86_64/virtio.txt

@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2019.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2019 ###
-Visual Studio 2019 version 16.11.7 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 version 16.11.7 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
 
 Installed MSVC-2019 Components:
 
@@ -66,7 +66,7 @@ Windows 10 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.7 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.7 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/msvc2022.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2022 Official release ###
-Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
 
 Installed MSVC-2022 Components:
 
@@ -60,7 +60,7 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
- Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-10_21H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/virtio-win-0.1.204.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.204.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.204.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/create_windows-11_image_with_virtio_drivers.txt

@@ -2,7 +2,7 @@
 
 # Create Ubuntu 20.04 and install virt-manager:
 Create e.g. Ubuntu 20.04 VM
-Connect to machine and download the ISO-image and virtio-drivers (http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.204.iso or https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/)
+Connect to machine and download the ISO-image and virtio-drivers (http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.204.iso or https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.204-1/)
 sudo apt update
 sudo apt install virt-manager
 sudo systemctl start libvirtd

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2015_update.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2015 ###
-Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.ci.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
+Visual Studio 2015 version 14.0.25420.1 Update 3 was installed manually using ISO-image: http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_dvd_8923272.iso
 (Mount the ISO-image by double clicking it and run 'vs_professional.exe')
 
 default plus following components were selected:

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2019.txt

@@ -1,5 +1,5 @@
 ### Visual Studio 2019 ###
-Visual Studio 2019 version 16.11.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 version 16.11.5 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
 
 Installed MSVC-2019 Components:
 
@@ -66,7 +66,7 @@ Windows 11 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.5 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/msvc2022.txt

@@ -1,7 +1,7 @@
 ### Visual Studio 2022 Preview ###
-Visual Studio 2022 version 17.0.0 preview 7.0 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional_2022_preview.exe
+Visual Studio 2022 version 17.0.0 preview 7.0 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional_2022_preview.exe
 ### Visual Studio 2022 Official release ###
-Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 version 17.0.1 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
 
 Installed MSVC-2022 Components:
 
@@ -62,10 +62,10 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
-Visual studio 2022 build tools version 17.0.0 preview 7.0 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__msvc2022_preview.exe"
+Visual studio 2022 build tools version 17.0.0 preview 7.0 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__msvc2022_preview.exe"
  * Only default installation, no additional selections
 
- Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.0.1 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
 
 ############################################################

coin/pre-provisioning/qtci-windows-11_21H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/msvc2019.txt

@@ -67,7 +67,7 @@ Windows 11 SDK (10.0.22000.0)
 ############################################################
 ### Visual Studio 2019 build tools ###
 
-Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
 Visual studio 2019 build tools were updated to version 16.11.27 with Visual Studio Installer
 

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/msvc2022.txt

@@ -62,7 +62,7 @@ Windows Universal C Runtime
 ############################################################
 ### Visual Studio 2022 build tools ###
 
- Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+ Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
  Visual Studio 2022 build tools were updated to 17.6.4 vith Visual Studio Installer
   * Some of the installed framework versions are out of support and do not get any security updates

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/virtio.txt

@@ -6,7 +6,7 @@ to using the VirtIO NIC in KVM.
 
 NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/virtio-win-0.1.185.iso
 * Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/provisioning/common/linux/android_emulator_launcher.sh

@@ -1,112 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# This util launches the Android emulator and ensures it doesn't stuck/freeze
-# by detecting that and restarting it
-
-set -e
-
-EMULATOR_MAX_RETRIES=5
-ADB_MAX_TIMEOUT=300
-EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
-ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
-LOGCAT_PATH="$COIN_CTEST_RESULTSDIR/emulator_logcat_%iter.txt"
-EMULATOR_RUN_LOG_PATH="$COIN_CTEST_RESULTSDIR/emulator_run_log_%iter.txt"
-
-if [ -z "${ANDROID_EMULATOR}" ]; then
-    echo "No AVD name provided via ANDROID_EMULATOR env variable. Aborting!"
-    exit 1
-fi
-
-function check_for_android_device
-{
-    $ADB_EXEC devices | awk 'NR==2{print $2}' | grep -qE '^(online|device)$'
-}
-
-# WARNING: On the very first boot of the emulator it happens that the device
-# "finishes" booting and getprop shows bootanim=stopped and
-# boot_completed=1. But sometimes not all packages have been installed (`pm
-# list packages` shows only 16 packages installed), and after around half a
-# minute the boot animation starts spinning (bootanim=running) again despite
-# boot_completed=1 all the time. After some minutes the boot animation stops
-# again and the list of packages contains 80 packages. Only then the device is
-# fully booted, and only then is dev.bootcomplete=1.
-#
-# To reproduce the emulator booting as the first time, you have to delete the
-# cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the
-# "userdata-qemu.img.qcow2" file.
-function check_if_fully_booted
-{
-    # The "getprop" command separates lines with \r\n so we trim them
-    bootanim=$(      timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim  | tr -d '\r\n')
-    boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n')
-    bootcomplete=$(  timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete   | tr -d '\r\n')
-    echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete"
-    [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
-}
-
-for counter in $(seq ${EMULATOR_MAX_RETRIES})
-do
-    $ADB_EXEC kill-server
-    $ADB_EXEC start-server
-
-    if check_for_android_device
-    then
-        echo "Emulator is already running but it shouldn't be. Terminating it now..."
-        pkill '^qemu-system-' || true
-        sleep 5
-    fi
-
-    LOGCAT_PATH=${LOGCAT_PATH//%iter/${counter}}
-    EMULATOR_RUN_LOG_PATH=${EMULATOR_RUN_LOG_PATH//%iter/${counter}}
-
-    echo "Starting emulator ${ANDROID_EMULATOR}, try ${counter}/${EMULATOR_MAX_RETRIES}" \
-        | tee "${EMULATOR_RUN_LOG_PATH}"
-    $EMULATOR_EXEC -avd "$ANDROID_EMULATOR" \
-        -gpu swiftshader_indirect -no-audio -no-window -no-boot-anim \
-        -cores 4 -memory 16000 -partition-size 4096 \
-        -detect-image-hang -restart-when-stalled -no-snapshot-save \
-        -no-nested-warnings -logcat *:v -logcat-output "${LOGCAT_PATH}" \
-        </dev/null  >"${EMULATOR_RUN_LOG_PATH}" 2>&1 &
-    emulator_pid=$!
-    disown $emulator_pid
-
-    echo "Waiting ${ADB_MAX_TIMEOUT} seconds for emulated device to appear..."
-    timeout ${ADB_MAX_TIMEOUT} "$ADB_EXEC" wait-for-device
-
-    echo "Waiting a few minutes for the emulator to fully boot..."
-    emulator_status=down
-    for _ in $(seq ${ADB_MAX_TIMEOUT})
-    do
-        sleep 1
-
-        if check_for_android_device && check_if_fully_booted
-        then
-            emulator_status=up
-            break
-        fi
-    done
-
-    # If emulator status is still offline after timeout period,
-    # we can assume it's stuck, and we must restart it
-    if [ $emulator_status = up ]
-    then
-        echo "Emulator started successfully"
-        break
-    else
-        if [ "$counter" -lt "$EMULATOR_MAX_RETRIES" ]
-        then
-            echo "Emulator failed to start," \
-                 "forcefully killing current instance and re-starting emulator"
-            kill $emulator_pid || true
-            sleep 5
-        elif [ "$counter" -eq "$EMULATOR_MAX_RETRIES" ]
-        then
-            echo "Emulator failed to start, reached maximum number of retries. Aborting\!"
-            exit 2
-        fi
-    fi
-done
-
-exit 0

coin/provisioning/common/linux/android_linux.sh

@@ -18,34 +18,25 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-sudo mkdir -p "$sdkTargetFolder"
+sudo mkdir -p $sdkTargetFolder
 
-basePath="http://ci-files01-hki.ci.qt.io/input/android"
+basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="34.0.0"
-sdkApiLevel="android-34"
+sdkBuildToolsVersion="33.0.1"
+sdkApiLevel="android-33"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
 ndkSha1Default=$ndkSha1Latest
-
-# Android 14 avd zip
-android14SystemZipName="android14system_UPB5_230623_003.tar.gz"
-android14SystemZipSha="9680db449516ad6212525cc53f2bc027cf8b3322"
-android14SystemPath="$basePath/$android14SystemZipName"
-
-# Android Automotive max SDK level image
-sdkApiLevelAutomotiveMax="android-33"
-androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
-androidAutomotiveMaxSha="b020a938ec46af2510047284406e9bed608cad03"
-# Android Automotive min SDK level image
-sdkApiLevelAutomotiveMin="android-29"
-androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f"
+# Android automotive
+sdkApiLevelAutomotive="android-31"
+androidAutomotive12Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
+androidAutomotive="android-automotive"
+androidAutomotive12Sha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -61,7 +52,7 @@ function InstallNdk() {
     ndkVersion=$1
     ndkSha1=$2
 
-    if [[ ! -d "$targetFolder/android-ndk-$ndkVersion" ]]; then
+    if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
 
         ndkFile="android-ndk-$ndkVersion-linux.zip"
         ndkTargetFile="/tmp/$ndkFile"
@@ -104,11 +95,11 @@ if [ "$http_proxy" != "" ]; then
     echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
                    --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port"  \
                    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval "$sdkmanager_no_progress_bar_cmd"
+        | eval $sdkmanager_no_progress_bar_cmd
 else
     echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
                    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-        | eval "$sdkmanager_no_progress_bar_cmd"
+        | eval $sdkmanager_no_progress_bar_cmd
 fi
 
 echo "Checking the contents of Android SDK..."
@@ -119,25 +110,30 @@ SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
 # shellcheck disable=SC2129
-cat <<EOB >>~/versions.txt
-Android SDK tools = $toolsVersion
-Android SDK Build Tools = $sdkBuildToolsVersion
-Android SDK API level = $sdkApiLevel
-Android NDK = $ndkVersion
-EOB
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt
 
 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
-./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
-echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
-echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
+    | eval $sdkmanager_no_progress_bar_cmd
+
+echo "Download and unzip Android Emulator version 32.1.15"
+emulatorFileName="emulator-linux_x64-10696886.zip"
+emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
+emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
+emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
+emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
+DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
+echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
+sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
+rm "$emulatorTargetFile"
+
+echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
+
+echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
 
-echo "Extract stored Android 14 Beta $android14SystemZipName"
-DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
-    "/tmp/$android14SystemZipName"
-sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
 
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -148,28 +144,12 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
     -k "system-images;android-33;google_apis;x86_64"
 
-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
-    -k "system-images;android-34;google_apis;x86_64"
-
-echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
-DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
-    "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -C "$sdkTargetFolder/system-images"
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomotiveMax};android-automotive;x86_64"
-
-echo "Install minimum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMin"
-DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \
-    "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"
+echo "Install $sdkApiLevelAutomotive $androidAutomotive"
+DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \
+    "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
+sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
+echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
+    -k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86_64"
 
 # Purely informative, show the list of avd devices
 ./avdmanager list avd
-
-# To be used by the VMs to start the emulator for tests
-emulator_script_filename="android_emulator_launcher.sh"
-cp "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/${emulator_script_filename}" "${HOME}"
-ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
-SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"

coin/provisioning/common/linux/axivion-bauhaus-suite.sh

@@ -17,35 +17,28 @@ DownloadAndExtract () {
     file=$3
 
     DownloadURL "$url" "$url" "$sha" "$file"
-    tar -xzvf "$file"
+    tar -xzvf $file
 
-    rm -rf "$file"
+    rm -rf $file
 }
 
 
 # Axivion Bauhaus Suite
-sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_2-x86_64-gnu_linux.tar.gz"
-targetFile="bauhaus-suite-7_6_2-x86_64-gnu_linux.tar.gz"
-sha1="a47891ec1a258240b72b1b5410413da900b30b14"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+sha1="20bfa8872b90ff11394098a833d536229425535e"
 cd $HOME
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
 
-# Temporary patch for fixing qt rules
-cd $HOME/bauhaus-suite/lib/scripts/bauhaus/rfg/dynamic
-rm qt_support.py
-wget http://ci-files01-hki.ci.qt.io/input/axivion/qt_support.py
-cd $HOME
-# Temporary patch ends
-
 mkdir $HOME/.bauhaus
 cd "$HOME/.bauhaus"
 wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_20231231.key
-cd "$HOME"
+cd $HOME
 
 #Axivion configuration
-configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config_762.tar.gz"
+configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config.tar.gz"
 configurationTargetFile="axivion_config.tar.gz"
-configSha1="2c5ce2ed2f1a2e8fd8a6a2a07a12c9c7d9e90413"
+configSha1="f3aa53f253fa00c7f3fa64e9fe55aa7f93bc5377"
 DownloadAndExtract "$configurationFile" "$configSha1" "$configurationTargetFile" "$HOME"
 
-echo "Axivion Bauhaus Suite = 7.6.2" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = 7.6.0_wavefront-2022-03-16" >> ~/versions.txt

coin/provisioning/common/linux/bootstrap-autostart.sh

@@ -11,10 +11,10 @@ set -ex
 wrapper="${HOME}/bootstrap-agent.sh"
 autostart_folder="${HOME}/.config/autostart"
 # This directory should exist. Created in base image (tier 1)
-mkdir -p "${autostart_folder}"
+mkdir -p ${autostart_folder}
 
 # Create autostart desktop file and shell wrapper
-sudo tee "${autostart_folder}/coin-bootstrap-agent.desktop" <<"EOF"
+sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
 [Desktop Entry]
 Type=Application
 Exec=/home/qt/bootstrap-agent.sh
@@ -23,7 +23,7 @@ X-GNOME-Autostart-enabled=true
 Name=Coin
 EOF
 
-sudo tee "$wrapper" <<"EOF"
+sudo tee $wrapper <<"EOF"
 #!/bin/sh
 # Wait for network to come up
 x=0
@@ -85,5 +85,5 @@ fi
 EOF
 
 # set owner and permissions
-sudo chown qt:users "$wrapper"
-sudo chmod 755 "$wrapper"
+sudo chown qt:users $wrapper
+sudo chmod 755 $wrapper

coin/provisioning/common/linux/cleanup_cache.sh

@@ -18,7 +18,7 @@ if grep -q "^$QT_USER:" /etc/passwd; then
 else
     echo "(WW) user $QT_USER not found."
     echo "---- skipping cache cleanup."
-    exit 0
+    exit 0;
 fi
 
 # assume /home/qt as ~ won't expand into sudo
@@ -32,11 +32,12 @@ if sudo [ -d "$CACHEDIR" ]; then
        echo "---- removing content:"
 
        # List files and delete in a loop as wildcard won't expand into sudo
-       sudo ls -A1 "$CACHEDIR" | while read -r FILE
-       do
+       FILES=`sudo ls -A1 $CACHEDIR`
+       while read FILE;
+           do
            echo "--- rm -rf $FILE"
            sudo rm -rf "$CACHEDIR/$FILE"
-       done
+       done <<< $FILES
     else
        echo "(**) cache in $CACHEDIR is empty."
     fi
@@ -45,7 +46,7 @@ else
         # replace a cache file with a directory
         echo "(WW) $CACHEDIR is a file."
         echo "---- removing $CACHEDIR."
-        sudo rm -r "$CACHEDIR"
+        sudo rm -rf "$CACHEDIR"
     else
         echo "(WW) cache directory $CACHEDIR not found."
     fi

coin/provisioning/common/linux/cmake_linux.sh

@@ -13,7 +13,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.27"
 version="3.27.7"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
 SHA1="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f"
 targetFolder="/opt/cmake-$version"

coin/provisioning/common/linux/cmake_min_supported.sh

@@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.16"
 version="3.16.8"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
 SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c"
 targetFolder="/opt/cmake-$version"

coin/provisioning/common/linux/disable-ntp_linux.sh

@@ -8,9 +8,9 @@ echo "Disable Network Time Protocol (NTP)"
 
 if uname -a |grep -q "Ubuntu\|Debian" ; then
     sudo timedatectl set-ntp false
-elif grep "PRETTY_NAME" /etc/os-release | grep -q "Leap 15"; then
+elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
     (sudo systemctl stop chronyd && sudo systemctl disable chronyd)
-elif grep -q "SUSE Linux Enterprise Server 15" /etc/os-release; then
+elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
     sudo timedatectl set-ntp false
 else
     sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off

coin/provisioning/common/linux/disable_kwin_overview.sh

@@ -7,7 +7,7 @@ set -f
 QT_USER="qt"
 CONFDIR=".config"
 KWINRC="kwinrc"
-KWC5=$(which kwriteconfig5)
+KWC5=`which kwriteconfig5`
 
 if [ -z "$KWC5" ]; then
     echo "(WW) kwriteconfig5 script not found."

coin/provisioning/common/linux/docker.sh

@@ -4,38 +4,37 @@
 
 set -e
 
-PROVISIONING_DIR="$(dirname "$0")/../../"
-# shellcheck source=../unix/common.sourced.sh
-source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-# shellcheck source=../unix/DownloadURL.sh
-source "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
-localRepo=http://ci-files01-hki.ci.qt.io/input/docker
+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
+
+
+localRepo=http://ci-files01-hki.intra.qt.io/input/docker
 upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/
 
-function getEachUpstream () {
-    while read -r sha f
-    do DownloadURL "$localRepo/$f" "$upstreamRepo/$f" "$sha"
-    done
-}
-cat <<EOF | getEachUpstream
-2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
-ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
-130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
-EOF
+echo '
+    2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
+    ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+    130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+' \
+    | xargs -n2 | while read  sha f
+do
+    DownloadURL  $localRepo/$f  $upstreamRepo/$f  $sha
+done
 
 sudo apt-get -y install  ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
 rm -f                    ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
 
-sudo usermod -a -G docker "$USER"
+sudo usermod -a -G docker $USER
 sudo docker --version
 
 # Download and install the docker-compose extension from https://github.com/docker/compose/releases
 f=docker-compose-$(uname -s)-$(uname -m)
 dockerComposeVersion="v2.15.1"
 DownloadURL  \
-    "$localRepo/$f-${dockerComposeVersion}" \
-    "https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f" \
+    $localRepo/$f-${dockerComposeVersion}  \
+    https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
     bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
 sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
 sudo docker-compose --version
@@ -45,4 +44,4 @@ rm ./docker-compose*
 sudo apt-get install avahi-daemon -y
 
 # Start testserver provisioning
-sudo "$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")/../shared/testserver/docker_testserver.sh"
+sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"

coin/provisioning/common/linux/fbx_linux.sh

@@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 set -e
 tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
 targetFolder="/opt/fbx"
-cachedUrl="http://ci-files01-hki.ci.qt.io/input/fbx/$tarballName"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName"
 officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName"
 sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605"
 tmpFolder="/tmp"

coin/provisioning/common/linux/gcc.sh

@@ -19,13 +19,13 @@ function InstallGCC() {
 
     tmpFolder="/tmp"
 
-    prebuiltGCC="http://ci-files01-hki.ci.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
+    prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
     prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz"
     installPrefix="/usr/local"
 
     suffixVersion=$(echo "$version" | cut -d "." -f1,2)
     sourceFile="gcc-$version.tar.xz"
-    cachedUrl="http://ci-files01-hki.ci.qt.io/input/gcc/$sourceFile"
+    cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
     officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
 
     targetFile="$tmpFolder/$sourceFile"

coin/provisioning/common/linux/install-cpdb.sh

@@ -2,7 +2,7 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# This script installs cpdb from sources.
+# This script install cpdb from sources.
 # Requires GCC and Perl to be in PATH.
 # The following dependencies should be pre-installed:
 #  make, autoconf, autopoint, libglib2.0-dev, libdbus-1-dev, libtool
@@ -13,14 +13,14 @@ gitUrl="https://github.com/openprinting/$repName.git"
 tmpdir="/tmp"
 repDir="$tmpdir/$repName"
 prefix="/usr"
-rm -rf "$repDir"
-cd "$tmpdir"
-git clone -q "$gitUrl"
-cd "$repDir"
+rm -rf $repDir
+cd $tmpdir
+git clone $gitUrl >/dev/null
+cd $repDir
 # cpdb-libs v2.0b4 with build bug fixed
-git checkout -q ce848f1571a82ec03881fce127ff28bec8da239e
+git checkout ce848f1571a82ec03881fce127ff28bec8da239e > /dev/null
 ./autogen.sh > /dev/null
-./configure --prefix="$prefix" > /dev/null
-make "-j$(nproc)" > /dev/null && sudo make install > /dev/null
+./configure --prefix=$prefix > /dev/null
+make -j$(nproc) > /dev/null && sudo make install > /dev/null
 sudo ldconfig
-rm -rf "$repDir"
+rm -rf $repDir

coin/provisioning/common/linux/install-flite.sh

@@ -16,11 +16,11 @@ gitUrl="https://github.com/festvox/$repName.git"
 tmpdir="/tmp"
 repDir="$tmpdir/$repName"
 prefix="/usr"
-rm -rf "$repDir"
-cd "$tmpdir"
-git clone -q "$gitUrl"
-cd "$repDir"
-git checkout -q v2.2
-./configure --with-pic --enable-shared --prefix="$prefix" > /dev/null
-make "-j$(nproc)" > /dev/null && sudo make install > /dev/null
-rm -rf "$repDir"
+rm -rf $repDir
+cd $tmpdir
+git clone $gitUrl >/dev/null
+cd $repDir
+git checkout v2.2 > /dev/null
+./configure --with-pic --enable-shared --prefix=$prefix > /dev/null
+make -j$(nproc) > /dev/null && sudo make install > /dev/null
+rm -rf $repDir

coin/provisioning/common/linux/install-git.sh

@@ -13,21 +13,21 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="2.36.1"
 officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
-cachedUrl="http://ci-files01-hki.ci.qt.io/input/git/git-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
 targetFile="/tmp/git-$version.tar.gz"
 sha="a17c11da2968f280a13832d97f48e9039edac354"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 sourceDir="/tmp/git-$version-source"
-mkdir "$sourceDir"
-tar -xzf "$targetFile" -C "$sourceDir"
+mkdir $sourceDir
+tar -xzf "$targetFile" -C $sourceDir
 
 cd "$sourceDir/git-$version"
 installDir="$HOME/git"
 make configure
-./configure --prefix="$installDir"
+./configure --prefix=$installDir
 make all
 sudo make install
 
 SetEnvVar "PATH" "\"$installDir/bin:\$PATH\""
 
-"$installDir/bin/git" --version
+$installDir/bin/git --version

coin/provisioning/common/linux/install-nodejs.sh

@@ -25,7 +25,7 @@ case "$uname_m" in
     *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
 esac
 
-internalUrl="http://ci-files01-hki.ci.qt.io/input/nodejs/$pkgname"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/nodejs/$pkgname"
 externalUrl="https://nodejs.org/dist/v$version/$pkgname"
 
 targetFile="$HOME/$pkgname"

coin/provisioning/common/linux/install_dwz.sh

@@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="0.13"
 sha1="21e6d5878bb84ac6c9ad07b00ed248d8c547bc7d"
-internalUrl="http://ci-files01-hki.ci.qt.io/input/centos/dwz-$version.tar.xz"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/centos/dwz-$version.tar.xz"
 externalUrl="https://www.sourceware.org/ftp/dwz/releases/dwz-$version.tar.xz"
 
 targetDir="$HOME/dwz"

coin/provisioning/common/linux/integrity.sh

@@ -11,8 +11,8 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-urlToolchainEs7="http://ci-files01-hki.ci.qt.io/input/integrity/integrity_toolchain_es7_05102022.zip"
-urlLibeglmegapack="http://ci-files01-hki.ci.qt.io/input/integrity/integrity_libeglmegapack.zip"
+urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_05102022.zip"
+urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
 SHA1_toolchainEs7="a95e11996d89218ac93493484e483d169976f565"
 SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
 targetFolder="$HOME"
@@ -26,7 +26,7 @@ InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_to
 echo "Install Integrity toolchain addons"
 DownloadURL "$urlLibeglmegapack" "$urlLibeglmegapack" "$SHA1_Libeglmegapack" "/tmp/integrity_libeglmegapack.zip"
 unzip "/tmp/integrity_libeglmegapack.zip" -d "/tmp"
-mv /tmp/toolchain/* "$targetFolder/toolchain"
-mv "$targetFolder/toolchain" "$targetFolder/integrity_toolchain"
-cp "$toolchain_file" "$targetFolder/integrity_toolchain/toolchain.cmake"
+mv /tmp/toolchain/* $targetFolder/toolchain
+mv $targetFolder/toolchain $targetFolder/integrity_toolchain
+cp $toolchain_file "$targetFolder/integrity_toolchain/toolchain.cmake"
 sudo rm -fr /tmp/toolchain

coin/provisioning/common/linux/mimersql.sh

@@ -7,13 +7,11 @@ set -e
 SSL_VER=$1
 PACK_TYPE=$2
 PROVISIONING_DIR="$(dirname "$0")/../../"
-# shellcheck source=../unix/common.sourced.sh
-source "${BASH_SOURCE%/*}/../unix/common.sourced.sh"
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
 
-localRepo=http://ci-files01-hki.ci.qt.io/input/docker
+localRepo=http://ci-files01-hki.intra.qt.io/input/docker
 upstreamRepo=http://install.mimer.com/qt
 if [ "$SSL_VER" = "openssl-3" ]; then
     if [ "$PACK_TYPE" = "rpm" ]; then

coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -e
-
-targetDir="$HOME/vcpkg-cache"
-
-# Specify the path to the credential file
-credentialsFile="$HOME/samba_credentials"
-
-sudo mkdir -p "$targetDir"
-
-# Mount the SMB share
-# Check if the mount was successful
-if sudo mount -t cifs //vcpkg-server.ci.qt.io/vcpkg "$targetDir" -o credentials="$credentialsFile",uid="$(id -u)",gid="$(id -g)"
-then
-    echo "SMB share mounted successfully!"
-else
-    echo "Failed to mount SMB share."
-fi

coin/provisioning/common/linux/qnx_710.sh

@@ -18,9 +18,9 @@ DownloadAndExtract () {
     folder=$4
 
     DownloadURL "$url" "$url" "$sha" "$file"
-    sudo tar -C "$folder" -Jxf "$file"
+    sudo tar -C $folder -Jxf $file
 
-    rm -rf "$file"
+    rm -rf $file
 }
 
 aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
@@ -33,36 +33,36 @@ folderName="qnx710"
 targetPath="$targetFolder$folderName"
 qemuTargetPath="$HOME/QNX"
 qemuIpAddress="172.31.1.10"
-export qemuNetwork="172.31.1.1"
+qemuNetwork="172.31.1.1"
 qemuSSHuser="root"
 qemuSSHurl="$qemuSSHuser@$qemuIpAddress"
 qemuLDpath="/proc/boot:/system/lib:/system/lib/dll:/home/qt/work/install/target/lib"
 
 if [ ! -d "$targetFolder" ]; then
-    mkdir -p "$targetFolder"
+    mkdir -p $targetFolder
 fi
 
 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
 targetFile="qnx710.tar.xz"
 sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
-sudo cp "$aarch64le_toolchain" "$targetPath"
-sudo cp "$armv7le_toolchain" "$targetPath"
-sudo cp "$x8664_toolchain" "$targetPath"
-cp -R "$QNX_qemu_bld_files_dir" "$qemuTargetPath"
+sudo cp $aarch64le_toolchain $targetPath
+sudo cp $armv7le_toolchain $targetPath
+sudo cp $x8664_toolchain $targetPath
+cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
 # fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
 # Download code-only package from https://www.iana.org/time-zones and follow README
 # to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
 # package which contains it and update required info below
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
 targetFile="qnx_qemu_utils.tar.xz"
 targetFolder="$qemuTargetPath/local/misc_files"
 sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
-
-mkdir -p "$targetFolder"
-
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
 # Add ssl certificates. Expects Ubuntu 20.04 LTS with ca-certificates package installed
@@ -73,10 +73,10 @@ cp -PR /etc/ssl/certs/* "$targetFolder/etc/ssl/certs"
 sudo chown -R qt:users "$targetPath"
 
 # Verify that we have last files in tars
-if [ ! -f "$targetPath/qnxsdp-env.sh" ] || [ ! -f "$targetPath/qnx-toolchain-x8664.cmake" ]
+if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
 then
     echo "QNX toolchain installation failed!"
-    exit 1
+    exit -1
 fi
 
 # Set env variables

coin/provisioning/common/linux/squish-coco.sh

@@ -15,7 +15,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 version="4.2.2"
 sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6"
 package="SquishCocoSetup_${version}_Linux_x86_64.run"
-url="http://ci-files01-hki.ci.qt.io/input/coco//$package"
+url="http://ci-files01-hki.intra.qt.io/input/coco//$package"
 
 echo "Enable license for  Coco"
 

coin/provisioning/common/linux/vx_works.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs vxworks libs and toolchain.
-
-set -ex
-
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-VXWORKS_VER="23_09"
-######### VXworks libs #########
-# Installs to /opt/vxworks
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_no_source_patched_$VXWORKS_VER.tar.gz"
-AltUrl=""
-sha1="35a457999b310a6128e3bd7de3103c2235063071"
-targetFolder="/opt/"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-SetEnvVar "VXWORKS_HOME" "/opt/vxworks"
-
-######### VXworks toolchain #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VSB
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_vsb_$VXWORKS_VER.tar.gz"
-AltUrl=""
-sha1="cd32d35e67fd6128fbfbb23207bb4d1d2d09b7d2"
-targetFolder="/opt/"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"
-
-######### VXworks VIP kernel #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_vip_kernel_$VXWORKS_VER.tar.gz"
-AltUrl=""
-sha1="d72bb635a00a5b1b82185e3c200078cbe5c39561"
-targetFolder="/opt/"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-SetEnvVar "VXWORKS_SSH" "WindRiver@10.0.2.4"
-
-# Setup NFS exports that are needed by VxWorks qemu
-sudo bash -c "echo '/home/qt/work 10.0.2.4/24(rw,sync,root_squash,no_subtree_check,anonuid=1000,anongid=1000)' >> /etc/exports"
-sudo bash -c "echo '/opt/fsl_imx6_2_0_6_2_VSB 10.0.2.4/24(rw,sync,root_squash,no_subtree_check,anonuid=1000,anongid=1000)' >> /etc/exports"
-sudo exportfs -a
-
-# Copy start script in place
-cp "${BASH_SOURCE%/*}/../linux/vxworks_qemu_launcher.sh" "${HOME}"
-SetEnvVar "VXWORKS_EMULATOR" "${HOME}/vxworks_qemu_launcher.sh"

coin/provisioning/common/linux/vxworks_qemu_launcher.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# Setup bridge if not exist for VxWorks QEMU
-if ! ip link show br0 >/dev/null 2>&1; then
-    sudo brctl addbr br0
-    sudo brctl stp br0 off
-    sudo ifconfig br0 10.0.2.1 netmask 255.255.255.0 promisc up
-    sudo tunctl -u qt -t tap0
-    sudo ifconfig tap0 promisc up
-    sudo brctl addif br0 tap0
-fi
-
-QEMU_LOG_PATH="/home/qt/work/vxworks_qemu_log.txt"
-qemu-system-arm \
-    -machine sabrelite \
-    -smp 4 \
-    -m 1G \
-    -nographic \
-    -monitor none \
-    -serial null \
-    -serial stdio \
-    -kernel /opt/fsl_imx6_2_0_6_2_VIP_QEMU/default/uVxWorks \
-    -dtb /opt/fsl_imx6_2_0_6_2_VIP_QEMU/default/imx6q-sabrelite.dtb \
-    -append "enet(0,0)host:vxWorks h=10.0.2.1 g=10.0.2.1 e=10.0.2.4 u=target pw=vxTarget s=/romfs/startup_script_arm.txt" \
-    -nic "tap,ifname=tap0,script=no" >"${QEMU_LOG_PATH}" 2>&1 &
-
-for counter in $(seq 30)
-do
-    status=$(ssh -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa -o ConnectTimeout=1 ${VXWORKS_SSH} echo emulator up)
-    if [[ $status == *"emulator up"* ]] ; then
-        echo "VXWORKS QEMU SSH server up"
-        break
-    else
-        echo "Waiting VXWORKS QEMU SSH server"
-        sleep 1
-    fi
-done

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -11,7 +11,7 @@ function InstallPKGFromURL {
     targetDirectory=$4
 
     echo "Creating temporary file"
-    package_basename="${url/*\//}"
+    package_basename=$(echo "$url" | sed 's|^.*/||')
     tmpdir=$(mktemp -d)
     targetFile="$tmpdir/$package_basename"
     echo "Downloading PKG from primary URL '$url'"

coin/provisioning/common/macos/android.sh

@@ -8,13 +8,13 @@
 
 set -ex
 
-# shellcheck source=../unix/SetEnvVar.sh
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android"
+basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
 
 toolsVersion="2.1"
 # toolsFile dertermines tools version
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersionLatest="r25b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-33"
 
 toolsSourceFile="$basePath/$toolsFile"
 
@@ -58,7 +58,7 @@ sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 (echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
     "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+    | eval $sdkmanager_no_progress_bar_cmd
 
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"
@@ -69,9 +69,7 @@ SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest
 SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
-cat << EOT >>~/versions.txt
-Android SDK tools = $toolsVersion
-Android SDK Build Tools = $sdkBuildToolsVersion
-Android SDK API level = $sdkApiLevel
-Android NDK = $ndkVersionDefault
-EOT
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersionDefault" >> ~/versions.txt

coin/provisioning/common/macos/cmake.sh

@@ -13,7 +13,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 majorminorversion="3.27.7"
 version="3.27.7"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
 SHA1="75153b6c7a418bc7120c6217d4698c7d245d00e0"
 appPrefix="cmake-$version-macos-universal"

coin/provisioning/common/macos/disable_net_lso.sh

@@ -2,8 +2,7 @@
 # Copyright (C) 2021 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-sudo tee -a /Library/LaunchDaemons/net_tcp_tso_off.plist > /dev/null <<EOB
-<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+echo """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
 <plist version=\"1.0\">
 <dict>
@@ -31,4 +30,4 @@ sudo tee -a /Library/LaunchDaemons/net_tcp_tso_off.plist > /dev/null <<EOB
     <true/>
 </dict>
 </plist>
-EOB
+""" | sudo tee -a /Library/LaunchDaemons/net_tcp_tso_off.plist

coin/provisioning/common/macos/docker.sh

@@ -19,7 +19,7 @@ echo "Installing Docker for $chip chip"
 urlOccifical="https://desktop.docker.com/mac/main/${chip}/Docker.dmg?utm_source=docker"
 urlCache="http://ci-files01-hki.ci.qt.io/input/mac/Docker_${chip}.dmg"
 
-DownloadURL "$urlCache" "$urlOccifical" "$sha" "/tmp/Docker_${chip}.dmg"
+DownloadURL $urlCache $urlOccifical $sha "/tmp/Docker_${chip}.dmg"
 
 sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
 sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
@@ -27,7 +27,7 @@ sudo hdiutil detach /Volumes/Docker
 
 # Add registry mirror for docker images
 mkdir "$HOME/.docker"
-sudo tee -a "$HOME/.docker/daemon.json" <<"EOF"
+sudo tee -a $HOME/.docker/daemon.json <<"EOF"
 {
         "builder": { "gc": { "defaultKeepStorage": "20GB", "enabled": true } },
         "experimental": false,

coin/provisioning/common/macos/enable_zsh_history_and_viminfo.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-
-if [ -f /Users/qt/.zsh_history ]
-then
-  sudo chown qt:staff /Users/qt/.zsh_history
-fi
-
-if [ -f /Users/qt/.viminfo ]
-then
-  sudo chown qt:staff /Users/qt/.viminfo
-fi

coin/provisioning/common/macos/fbx_macos.sh

@@ -9,16 +9,16 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-#version="2016.1.2"
+version="2016.1.2"
 fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
-cachedUrl="/net/ci-files01-hki.ci.qt.io/hdd/www/input/fbx/$fileName"
+cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
 # officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
 targetFolder="/tmp"
 
 echo "Extracting '$cachedUrl'"
 tar -xzf "$cachedUrl" -C "$targetFolder"
 
-rm -rf "${targetFolder:?}/${fileName}"
+rm -rf "$targetFolder/$fileName"
 echo "Copying preinstalled FBX SDK to Applications"
 sudo cp -r "$targetFolder/Autodesk" /Applications
 

coin/provisioning/common/macos/homebrew.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
@@ -9,11 +9,11 @@
 
 set -e
 
-source "$(dirname "$0")"/../../common/unix/DownloadURL.sh
+. "$(dirname "$0")"/../../common/unix/DownloadURL.sh
 
 
 DownloadURL  \
-    http://ci-files01-hki.ci.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb  \
+    http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb  \
     https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install  \
     b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a  \
     /tmp/homebrew_install

coin/provisioning/common/macos/increase_limits.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (C) 2019 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
@@ -11,16 +11,16 @@
 set -e
 
 PROVISIONING_DIR="$(dirname "$0")/../../"
-# shellcheck source=../unix/common.sourced.sh
-source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
 
 echo "Current limits are:"
 ulimit -a
 launchctl limit
 
 $CMD_INSTALL -m 644 -o root -g wheel  \
-    "$PROVISIONING_DIR/common/macos/limit.maxfiles.plist"  \
-    "$PROVISIONING_DIR/common/macos/limit.maxproc.plist"   \
+    $PROVISIONING_DIR/common/macos/limit.maxfiles.plist  \
+    $PROVISIONING_DIR/common/macos/limit.maxproc.plist   \
     /Library/LaunchDaemons/
 
 # Activate the new limits immediately (not for the current session though)

coin/provisioning/common/macos/install_xcode.sh

@@ -25,7 +25,7 @@ function InstallXCode() {
         cd /Applications/ && sudo tar -zxf "$sourceFile"
     elif [[ $sourceFile =~ "xip" ]]; then
         if [[ $sourceFile =~ "http" ]]; then
-            Download "$sourceFile" "/Applications/Xcode_$version.xip"
+            Download $sourceFile /Applications/Xcode_$version.xip
             cd /Applications/ && xip -x "Xcode_$version.xip"
         else
             cd /Applications/ && xip -x "$sourceFile"
@@ -35,12 +35,12 @@ function InstallXCode() {
     fi
 
     echo "Versioning application bundle"
-    majorVersion=$(echo "$version" | cut -d '.' -f 1)
+    majorVersion=$(echo $version | cut -d '.' -f 1)
     versionedAppBundle="/Applications/Xcode${majorVersion}.app"
-    sudo mv /Applications/Xcode*.app "${versionedAppBundle}"
+    sudo mv /Applications/Xcode*.app ${versionedAppBundle}
 
     echo "Selecting Xcode"
-    sudo xcode-select --switch "${versionedAppBundle}"
+    sudo xcode-select --switch ${versionedAppBundle}
 
     echo "Accept license"
     sudo xcodebuild -license accept

coin/provisioning/common/macos/java.sh

@@ -10,7 +10,7 @@ echo "Installing Java Development Kit"
 version=11.0.12
 targetFile=jdk-${version}_osx-x64_bin.dmg
 
-url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
+url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
 # url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
 
 echo "Mounting $targetFile"

coin/provisioning/common/macos/java_arm.sh

@@ -10,7 +10,7 @@ echo "Installing Java Development Kit"
 
 targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
-url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
+url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
 # url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
 echo "Mounting $targetFile"

coin/provisioning/common/macos/libiodbc.sh

@@ -9,11 +9,11 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
+brew install --formula ${BASH_SOURCE%/*}/libiodbc.rb $*
 
 # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
 
-read -r -a arr <<< "$(brew list --versions libiodbc)"
+read -r -a arr <<< $(brew list --versions libiodbc)
 version=${arr[1]}
 
 SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"

coin/provisioning/common/macos/libusb.sh

@@ -7,7 +7,7 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 brew install libusb
-read -r -a arr <<< "$(brew list --versions libusb)"
+read -r -a arr <<< $(brew list --versions libusb)
 version=${arr[1]}
 echo "libusb = $version" >> ~/versions.txt
 
@@ -18,18 +18,17 @@ case $(sw_vers -productVersion) in
     11*) codename=big_sur;;
     12*) codename=monterey;;
     13*) codename=ventura;;
-    14*) codename=sonoma;;
 esac
 
-brew fetch --bottle-tag=arm64_"${codename}" libusb
-brew fetch --bottle-tag="${codename}" libusb
-tar xf "$(brew --cache --bottle-tag=arm64_"${codename}" libusb)" -C /tmp/arm64/
-tar xf "$(brew --cache --bottle-tag="${codename}" libusb)" -C /tmp/amd64
-for f in /tmp/arm64/libusb/"$version"/lib/* ; do
-    if lipo -info "$f" >/dev/null 2>&1; then
-        file="$(basename "$f")"
-        lipo -create -output "$(brew --cellar)/libusb/$version/lib/$file" \
-            "/tmp/arm64/libusb/$version/lib/$file" \
-            "/tmp/amd64/libusb/$version/lib/$file"
+brew fetch --bottle-tag=arm64_${codename} libusb
+brew fetch --bottle-tag=${codename} libusb
+tar xf $(brew --cache --bottle-tag=arm64_${codename} libusb) -C /tmp/arm64/
+tar xf $(brew --cache --bottle-tag=${codename} libusb) -C /tmp/amd64
+for f in /tmp/arm64/libusb/$version/lib/* ; do
+    if lipo -info $f >/dev/null 2>&1; then
+        file=$(basename $f)
+        lipo -create -output $(brew --cellar)/libusb/$version/lib/$file \
+            /tmp/arm64/libusb/$version/lib/$file \
+            /tmp/amd64/libusb/$version/lib/$file
     fi
 done