From cb182b59ca92e3195ca31fdb8d9b38a0b056fdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?=
 <pabloyoyoista@postmarketos.org>
Date: Fri, 30 Jan 2026 20:56:42 +0100
Subject: [PATCH] ci: don't set the CI_TRON_KERNEL_CMDLINE__DEVICEINFO globally
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This breaks the oneplus-fajita, since its own console argument is not
picked. And the other options don't make sense there anyway.

Signed-off-by: Pablo Correa Gómez <pabloyoyoista@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7881>
---
 .ci/build-jobs.yaml.j2                                       | 4 ----
 .../packages/single-runner-defined-in-ci-common.yml.j2       | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.ci/build-jobs.yaml.j2 b/.ci/build-jobs.yaml.j2
index 326fd3bf6..3eb64fad0 100644
--- a/.ci/build-jobs.yaml.j2
+++ b/.ci/build-jobs.yaml.j2
@@ -133,10 +133,6 @@ prepare-{{ device.name }}:
       {%- endif %}
   variables:
     CI_TRON__PMB_BUILD_JOB: "prepare-{{ device.name }}{% if device.has_kernel_variants %}: [$KERNEL_VARIANT]{% endif %}"
-    # FIXME: cmdline is hardcoded here, but ideally would be built from
-    # fragments using generate-kernel-cmdline...
-    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
-    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1'
 
 # Include the gitlab ci yml fragment, as found in
 # `device/$category/device-$devicename/gitlab-ci.yml.j2` which defines the jobs
diff --git a/device/.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2 b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
index cfa85dd68..1324b3a7d 100644
--- a/device/.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
+++ b/device/.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
@@ -15,3 +15,8 @@ test-{{ device.name }}:
     # Extended from build-jobs.yaml.j2
     - .device-boot-flow-separate-artifacts
     - .test-{{ device.name }}
+  variables:
+    # FIXME: cmdline is hardcoded here, but ideally would be built from
+    # fragments using generate-kernel-cmdline...
+    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
+    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 pmos.force-partition-resize psi=1'