[kde-linux/kde-linux] /: Pass VARIANT and CI_PIPELINE_URL to openQA, rename ISO_CHANNEL_URL

Git commit b526c65485ce0f56f19482c68b2b909deca4c226 by Thomas Duckworth.
Committed on 17/08/2026 at 06:46.
Pushed by tduck into branch 'master'.

Pass VARIANT and CI_PIPELINE_URL to openQA, rename ISO_CHANNEL_URL

Passes a VARIANT variable to openQA, so to differentiate our editions.
Passes CI_PIPELINE_URL downstream so it can be viewed in the Settings
tab on the openQA webUI.

Also renames ISO_CHANNEL_URL to CHANNEL_URL, as per openQA, as well as
pass an edition-specific CHANNEL_URL in upload-to-storage.sh.

M  +3    -1    .gitlab-ci.yml
M  +5    -1    upload-to-storage.sh
M  +3    -1    upload.sh

https://invent.kde.org/kde-linux/kde-linux/-/commit/b526c65485ce0f56f19482c68b2b909deca4c226

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94ecac5b..be1f69b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,11 @@ trigger-openqa:
     strategy: depend
   variables:
     IMAGE_URL: $IMAGE_URL
-    ISO_CHANNEL_URL: $ISO_CHANNEL_URL
+    CHANNEL_URL: $CHANNEL_URL
+    VARIANT: $VARIANT
     STAGING_CHANNEL_URL: $STAGING_CHANNEL_URL
     SYSUPDATE_PUBKEY_B64: $SYSUPDATE_PUBKEY_B64
+    UPSTREAM_CI_PIPELINE_URL: $UPSTREAM_CI_PIPELINE_URL
     OPENQA_BRANCH: master
 
 # Collect the JUnit files produced by the triggered openQA pipeline.
diff --git a/upload-to-storage.sh b/upload-to-storage.sh
index 79500074..dd106327 100755
--- a/upload-to-storage.sh
+++ b/upload-to-storage.sh
@@ -8,6 +8,8 @@ set -eu
 # Output Directory
 OUTDIR="${OUTDIR:-mkosi.output}"
 
+. .kde-linux-metadata
+
 # We need to wire up an ephemeral image-signing key pair for OpenQA. We can't use the production key, but we still need
 # to test if the image can be upgraded to. Hence, create a key pair and pass it into OpenQA, where it will be injected
 # into the system.
@@ -50,9 +52,11 @@ go -C ./uploader/ run . --remote "s3+https://storage.kde.org/ci-artifacts/$CI_PR
 # Point OpenQA at the image we just uploaded.
 ISO_FILE=$(find upload-tree -maxdepth 1 -name '*.iso' | head -1 | xargs -r basename)
 echo "IMAGE_URL=https://storage.kde.org/ci-artifacts/$CI_PROJECT_PATH/j/$CI_JOB_ID/$ISO_FILE" >> build.env
-echo "ISO_CHANNEL_URL=https://storage.kde.org/kde-linux/testing/" >> build.env # For upgrade test flows
+echo "VARIANT=${KDE_LINUX_EDITION}" >> build.env
+echo "CHANNEL_URL=https://storage.kde.org/kde-linux/${KDE_LINUX_EDITION}/" >> build.env # For upgrade test flows
 echo "STAGING_CHANNEL_URL=https://storage.kde.org/ci-artifacts/$CI_PROJECT_PATH/j/$CI_JOB_ID/sysupdate/v2/" >> build.env
 echo "SYSUPDATE_PUBKEY_B64=$SYSUPDATE_PUBKEY_B64" >> build.env
+echo "UPSTREAM_CI_PIPELINE_URL=$CI_PIPELINE_URL" >> build.env
 
 echo "𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏𓃀𓂝𓏏"
 echo "You can find the raw disk images and sysupdate tree at:"
diff --git a/upload.sh b/upload.sh
index 0a69486a..7c10a568 100755
--- a/upload.sh
+++ b/upload.sh
@@ -125,10 +125,12 @@ stage() {
     # This is the public channel so we can do upgrade tests - openQA needs to
     # download the current public release to then test if we can upgrade to the
     # one that's just been built.
-    echo "ISO_CHANNEL_URL=${S3_CHANNEL_TARGET#s3+}" >> build.env
+    echo "CHANNEL_URL=${S3_CHANNEL_TARGET#s3+}" >> build.env
+    echo "VARIANT=${KDE_LINUX_EDITION}" >> build.env
     echo "IMAGE_URL=${S3_TARGET_STAGING#s3+}/$ISO_FILE" >> build.env
     echo "STAGING_CHANNEL_URL=${S3_TARGET_STAGING#s3+}/sysupdate/v2/" >> build.env
     echo "SYSUPDATE_PUBKEY_B64=" >> build.env
+    echo "UPSTREAM_CI_PIPELINE_URL=$CI_PIPELINE_URL" >> build.env
 }
 
 publish() {