aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTero Heikkinen <[email protected]>2025-05-19 14:08:31 +0300
committerLiang Qi <[email protected]>2025-06-04 22:48:21 +0200
commitd485277f353074eee83b5927e59a736ccbdb9ba6 (patch)
tree9dae65ec7ee5b03c099f8df40dd6a1b5fb8fee60
parent4c3fe223809e834cbf92f1733f2b2d2a6e34f5a0 (diff)
Ubuntu 24.04 aarch64: Upgrade to Ubuntu 24.04.2 LTS in Tier1 WaylandHEADdev
Old Tier1: qtci-linux-Ubuntu-24.04-aarch64-50 - Wayland New Tier1: qtci-linux-Ubuntu-24.04-aarch64-52 - Wayland Software updater subscription had to change: - From: Security updates only - To: Security and recommended updates - Otherwise provisioning 02-apt.sh updates fail Task-number: QTQAINFRA-7007 Task-number: QTBUG-127920 Pick-to: 6.10 Change-Id: Id8f02897bb06b9f84ac7748a9dc10bd0afa0e1c3 Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Simo Fält <[email protected]>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml6
-rw-r--r--coin/platform_configs/cmake_platforms_static_release.yaml2
-rw-r--r--coin/platform_configs/nightly_unity_builds.yaml2
-rw-r--r--coin/platform_configs/qt-creator.yaml2
-rw-r--r--coin/platform_configs/qtbase-new-compiler-testing.yaml2
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml2
-rw-r--r--coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS2
7 files changed, 10 insertions, 8 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 6c95b103a..fb385b8e3 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -21,7 +21,7 @@ Configurations:
# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
-
Id: 'ubuntu-24.04-arm64-developer-build'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
@@ -31,7 +31,7 @@ Configurations:
]
-
Id: 'ubuntu-24.04-arm64'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
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 -qpa offscreen\;xcb'
@@ -43,7 +43,7 @@ Configurations:
# Test on Ubuntu 24.04 ARM64 offscreen
-
Id: 'ubuntu-24.04-arm64-offscreen-tests'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['TestOnly']
Environment variables: [
diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml
index ff6563798..b51998109 100644
--- a/coin/platform_configs/cmake_platforms_static_release.yaml
+++ b/coin/platform_configs/cmake_platforms_static_release.yaml
@@ -48,7 +48,7 @@ Configurations:
]
-
Id: 'ubuntu-24.04-arm64'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml
index cb11c7121..e547d2b6c 100644
--- a/coin/platform_configs/nightly_unity_builds.yaml
+++ b/coin/platform_configs/nightly_unity_builds.yaml
@@ -36,7 +36,7 @@ Configurations:
]
-
Id: 'ubuntu-24.04-arm64-unity-build'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml
index 92dd314ee..4378c2a91 100644
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -22,7 +22,7 @@ Configurations:
Configure arguments: ''
Environment variables: []
-
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease']
Configure arguments: ''
diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml
index 7ee65d859..f7be250d8 100644
--- a/coin/platform_configs/qtbase-new-compiler-testing.yaml
+++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml
@@ -15,7 +15,7 @@ Configurations:
# Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
-
Id: 'ubuntu-24.04-arm64-gcc14'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 280049a3a..1606aa13b 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -54,7 +54,7 @@ Configurations:
]
-
Id: 'Ubuntu-24.04-arm64_Static'
- Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+ Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
diff --git a/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS
index 426c6694d..8ac83855f 100644
--- a/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS
@@ -36,6 +36,8 @@ Connect Your Online Accounts: Skip
Software & Updates:
* Updates:
* Subscribed to: Security updates only
+ * With 24.04.2:
+ Security and recommended updates --> to pass provisioning
* Automatically check for updates: Never
* Notify me of a new Ubuntu version: Never