From d054dd62e158d0851affaadeee6208b487e3bbf3 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 17 Sep 2026 03:50:16 +0000 Subject: [PATCH 1/3] test(e2e): report every failing extension, not just the first The six-phase LUKS end-to-end test has never passed in CI -- seven runs, every one red -- and run 35159067119 shows it clears all six phases and dies on one assertion: extension gsconnect@andyholmes.github.io: state=ERROR gnome-shell[2744]: Extension gsconnect@andyholmes.github.io: Error: Cannot inherit from a final type FAIL: extension gsconnect@andyholmes.github.io did not reach ACTIVE That is the GNOME 51 break #88 describes, and PR #89 fixes it. The problem this commit addresses is what happens next: the loop called fail() on the first bad extension, so search-light was never evaluated. Its guard (PR #46, open since 2026-09-06) is also absent from main, so it is very likely broken too -- and the way the test is written, the only way to find out is to fix GSConnect, wait another ~35 minutes, and be told about the second one. This is the same shape as the failures 718d4e4 and 60e6a6e kept hitting in the factory: each defect hidden behind the one before it, one full run per layer. A check whose job is to report what is broken should report all of it. The loop now records each failure and continues, prints them together, and fails once with the count. Unreadable state stays fatal for the reason the existing comment gives -- a check that cannot run reads as green, and did exactly that once. Per-extension screenshot names so two failures in one run do not overwrite each other's evidence. Nothing is weakened: every case that failed before still fails. Verified by splicing the real block into a harness with stubbed helpers and driving all four states -- both ACTIVE exits 0; both ERROR reports both and exits 1; one ERROR reports that one and exits 1; unreadable reports both and exits 1. 23 unit tests pass. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01W6BYLUD6KBzF8rBFXKjP7M --- iso/scripts/luks-e2e.sh | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/iso/scripts/luks-e2e.sh b/iso/scripts/luks-e2e.sh index a2aa70196..aba904e2d 100755 --- a/iso/scripts/luks-e2e.sh +++ b/iso/scripts/luks-e2e.sh @@ -508,8 +508,17 @@ echo " gnome-shell: running as ${TEST_USER}" # Search Light's dropped shader API) surface here as "Error"/"TypeError" lines # against the extension uuid. UTAH_E2E_EXTENSIONS lists the ones that must load # clean; empty to skip. +# +# Every listed extension is evaluated before the test gives its verdict, and +# the failures are reported together. Stopping at the first one costs a whole +# run per broken extension -- this check is the last step of a ~35-minute +# six-phase test, so serially discovering two known GNOME 51 breaks (the +# GSConnect clipboard final-type and Search Light's dropped shader API, which +# are separate fixes) takes two runs to learn what one run already knew. The +# run still fails; it just says everything it found. EXT_CHECK="${UTAH_E2E_EXTENSIONS-gsconnect@andyholmes.github.io search-light@icedman.github.com}" if [[ -n "${EXT_CHECK}" ]]; then + ext_failures=() for uuid in ${EXT_CHECK}; do # State is the authoritative signal: an extension that threw at enable # is ERROR/OUT_OF_DATE, one that loaded is ACTIVE. Grepping the journal @@ -535,17 +544,25 @@ if [[ -n "${EXT_CHECK}" ]]; then # while asserting nothing.) Fail, and print the raw output. echo " extension ${uuid}: state could not be read" >&2 ssh_target "env BASH_ENV=/dev/null bash --noprofile --norc -c \"gnome-extensions info '${uuid}' 2>&1 | head -20\"" >&2 2>/dev/null || true - shot installed-ext-unreadable "${MONITOR_INSTALLED}" || true - fail "could not read the state of extension ${uuid}" + shot "installed-ext-unreadable-${uuid%%@*}" "${MONITOR_INSTALLED}" || true + ext_failures+=("${uuid}: state could not be read") + continue fi if [[ "${state}" != "ACTIVE" && "${state}" != "ENABLED" ]]; then echo " extension ${uuid}: state=${state}" >&2 ssh_target "env BASH_ENV=/dev/null bash --noprofile --norc -c \"journalctl --user -b --no-pager 2>/dev/null | grep -F '${uuid}' | grep -iE 'Error|TypeError|Exception|not a function' | tail -5\"" >&2 2>/dev/null || true - shot installed-ext-error "${MONITOR_INSTALLED}" || true - fail "extension ${uuid} did not reach ACTIVE on GNOME 51 (state=${state})" + shot "installed-ext-error-${uuid%%@*}" "${MONITOR_INSTALLED}" || true + ext_failures+=("${uuid}: state=${state}") + continue fi echo " extension ${uuid}: ${state}" done + if (( ${#ext_failures[@]} > 0 )); then + for failure in "${ext_failures[@]}"; do + echo " FAILED: ${failure}" >&2 + done + fail "${#ext_failures[@]} extension(s) did not reach ACTIVE on GNOME 51" + fi fi # Ask for the user's *graphical* session by id rather than taking the first From d862f1349e7f7d38b31daa2641c11a81e7bddb83 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 18 Sep 2026 15:26:44 +0000 Subject: [PATCH 2/3] Drop the Search Light extension, which GNOME 51 cannot load The ISO end-to-end test has failed on utah and utah-nvidia since GSConnect was fixed, on the next extension in line: Extension search-light@icedman.github.com: TypeError: this.set_shader_source is not a function FAIL: extension search-light@icedman.github.com did not reach ACTIVE on GNOME 51 (state=ERROR) GNOME 51 removed the Clutter shader API the extension's blur effect calls. Rather than carry a fork of the effect, the extension goes: the submodule, its schema compile in build-gnome-extensions.sh, its entry in the source and installed extension checks, and its uuid in the e2e default list. Common still ships /etc/dconf/db/distro.d/05-bluefin-searchlight-extension, which holds only the extension's own settings (shortcut, colours, size), so the Containerfile removes it after copying Common in and the desktop contract no longer lists it. Nothing enables the extension anywhere in this tree, so no enabled-extensions key changes. just check's source-mode extension contract now reports eight extensions declaring GNOME 51. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01W6BYLUD6KBzF8rBFXKjP7M --- .gitmodules | 4 ---- Containerfile | 7 ++++++- contracts/bluefin-desktop.toml | 1 - docs/skills/desktop-contract.md | 7 +++++-- iso/scripts/luks-e2e.sh | 6 +++--- scripts/build-gnome-extensions.sh | 3 --- scripts/verify-gnome-extensions.py | 1 - .../gnome-shell/extensions/search-light@icedman.github.com | 1 - 8 files changed, 14 insertions(+), 16 deletions(-) delete mode 160000 system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com diff --git a/.gitmodules b/.gitmodules index 9ff70773c..323a07c71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = system_files/shared/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io url = https://github.com/projectbluefin/gnome-shell-extension-gsconnect.git branch = main -[submodule "system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com"] - path = system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com - url = https://github.com/projectbluefin/search-light.git - branch = main [submodule "system_files/shared/usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com"] path = system_files/shared/usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com url = https://github.com/projectbluefin/custom-command-menu.git diff --git a/Containerfile b/Containerfile index 1f0d9bac6..0def67eb4 100644 --- a/Containerfile +++ b/Containerfile @@ -85,7 +85,12 @@ RUN for pair in install-packages.py:utah-install-packages \ cp -a /tmp/utah-bluefin/. / && \ cp -a /tmp/utah-brew/. / && \ cp -a /tmp/utah-local/. / && \ - rm -rf /tmp/utah-scripts /tmp/utah-common /tmp/utah-bluefin /tmp/utah-brew /tmp/utah-local + rm -rf /tmp/utah-scripts /tmp/utah-common /tmp/utah-bluefin /tmp/utah-brew /tmp/utah-local && \ + rm -f /etc/dconf/db/distro.d/05-bluefin-searchlight-extension +# The last line drops Common's settings for the Search Light extension. Utah no +# longer ships that extension: its shader code calls set_shader_source, which +# GNOME 51 removed, so it errored at load and failed the ISO end-to-end test. +# Settings for an extension the image does not carry are noise in dconf. # This first check covers the flavor-independent contract only, which is why it # pins IMAGE_FLAVOR=main. verify-rpm-contract.py reads IMAGE_FLAVOR from the diff --git a/contracts/bluefin-desktop.toml b/contracts/bluefin-desktop.toml index 5fbada3ac..2c3268211 100644 --- a/contracts/bluefin-desktop.toml +++ b/contracts/bluefin-desktop.toml @@ -53,7 +53,6 @@ files = [ "/etc/dconf/db/distro.d/02-bluefin-keybindings", "/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette", "/etc/dconf/db/distro.d/04-bluefin-custom-command-menu", - "/etc/dconf/db/distro.d/05-bluefin-searchlight-extension", "/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings", ] diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md index 2ccadd89e..a27f71665 100644 --- a/docs/skills/desktop-contract.md +++ b/docs/skills/desktop-contract.md @@ -62,10 +62,13 @@ The TOML's sections are the contract's table of contents: ## GNOME extensions are pinned submodules Bluefin's GNOME extension submodules are retained with their normal build -step. `.gitmodules` pins nine of them by URL and branch under +step. `.gitmodules` pins eight of them by URL and branch under `system_files/shared/usr/share/gnome-shell/extensions/` — appindicator, bazaar-integration, blur-my-shell, caffeine, custom-command-list, -dash-to-dock, gradia-integration, gsconnect, and search-light. +dash-to-dock, gradia-integration, and gsconnect. Search Light was dropped: +its shader code calls `set_shader_source`, which GNOME 51 removed, so the +extension errored at load and failed the ISO end-to-end test on every +flavor. `scripts/verify-gnome-extensions.py` asserts every one declares GNOME 51 in its `metadata.json`. It runs in two modes from the same script: diff --git a/iso/scripts/luks-e2e.sh b/iso/scripts/luks-e2e.sh index aba904e2d..a6c45c562 100755 --- a/iso/scripts/luks-e2e.sh +++ b/iso/scripts/luks-e2e.sh @@ -504,8 +504,8 @@ echo " gnome-shell: running as ${TEST_USER}" # A shell session that started is not the same as one whose extensions loaded. # Assert the enabled extensions raised no load-time error this boot -- the -# GNOME-51 breaks this test exists to catch (GSConnect's clipboard final-type, -# Search Light's dropped shader API) surface here as "Error"/"TypeError" lines +# GNOME-51 breaks this test exists to catch (GSConnect's clipboard final-type; +# Search Light's dropped shader API, before it was removed) surface here as "Error"/"TypeError" lines # against the extension uuid. UTAH_E2E_EXTENSIONS lists the ones that must load # clean; empty to skip. # @@ -516,7 +516,7 @@ echo " gnome-shell: running as ${TEST_USER}" # GSConnect clipboard final-type and Search Light's dropped shader API, which # are separate fixes) takes two runs to learn what one run already knew. The # run still fails; it just says everything it found. -EXT_CHECK="${UTAH_E2E_EXTENSIONS-gsconnect@andyholmes.github.io search-light@icedman.github.com}" +EXT_CHECK="${UTAH_E2E_EXTENSIONS-gsconnect@andyholmes.github.io}" if [[ -n "${EXT_CHECK}" ]]; then ext_failures=() for uuid in ${EXT_CHECK}; do diff --git a/scripts/build-gnome-extensions.sh b/scripts/build-gnome-extensions.sh index 05660495a..66ddfea1e 100755 --- a/scripts/build-gnome-extensions.sh +++ b/scripts/build-gnome-extensions.sh @@ -109,9 +109,6 @@ fi # Custom Command Menu glib-compile-schemas --strict /usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com/schemas -# Search Light -glib-compile-schemas --strict /usr/share/gnome-shell/extensions/search-light@icedman.github.com/schemas - rm -rf /usr/share/gnome-shell/extensions/tmp echo "::endgroup::" diff --git a/scripts/verify-gnome-extensions.py b/scripts/verify-gnome-extensions.py index aa4487ab8..64e7679f7 100644 --- a/scripts/verify-gnome-extensions.py +++ b/scripts/verify-gnome-extensions.py @@ -17,7 +17,6 @@ "dash-to-dock@micxgx.gmail.com": "dash-to-dock@micxgx.gmail.com/metadata.json", "gradia-integration@alexandervanhee.github.io": "gradia-integration@alexandervanhee.github.io/src/metadata.json", "gsconnect@andyholmes.github.io": "gsconnect@andyholmes.github.io/data/metadata.json.in", - "search-light@icedman.github.com": "search-light@icedman.github.com/metadata.json", } diff --git a/system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com b/system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com deleted file mode 160000 index e1d9fff89..000000000 --- a/system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e1d9fff89d866a47181199602c0297ba3418f117 From a5d9c1766ea3fdebaec4c258a29fc3e08287f654 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 18 Sep 2026 15:29:37 +0000 Subject: [PATCH 3/3] Give the OGC kernel a KMS display, so gaming flavors reach a desktop The gaming and nvidia-gaming ISO end-to-end runs fail earlier than the extension check, in the live session: graphical.target: active gdm.service: active FAIL: no gnome-shell running for liveuser with a black screenshot. The two serial logs explain it. main's kernel prints [drm] Initialized simpledrm 1.0.0 for simple-framebuffer.0 on minor 0 and the OGC kernel (7.1.8-ogc1) prints no [drm] Initialized line at all. install-ogc-kernel.sh starts from x86_64 defconfig, which enables DRM and i915 only, so on any GPU that is not an Intel iGPU, QEMU's stdvga included, the kernel has no KMS device. GDM starts, mutter has nothing to open, and no shell ever runs. The installed system would behave the same way. The script now enables SYSFB_SIMPLEFB and DRM_SIMPLEDRM, which turn the EFI/VESA framebuffer into an unaccelerated KMS device on any hardware, and DRM_VIRTIO_GPU and DRM_BOCHS as modules for VMs. DRM_SIMPLEDRM joins the required_config list checked after olddefconfig, after install and on cache extraction, with a require_config gate that names it if olddefconfig drops it. Editing the script changes the kernel-cache tag, so CI rebuilds the cache before the next gaming image. Native drivers for real gaming GPUs (amdgpu, xe) are left out on purpose: they need linux-firmware in the image, which #97 records as missing. The kernel-cache skill records the diagnosis and where to look first. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01W6BYLUD6KBzF8rBFXKjP7M --- docs/skills/kernel-cache.md | 14 ++++++++++++++ scripts/install-ogc-kernel.sh | 22 +++++++++++++++++++++- tests/test_iso_ci.py | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/docs/skills/kernel-cache.md b/docs/skills/kernel-cache.md index 73d17bcb8..b60233b11 100644 --- a/docs/skills/kernel-cache.md +++ b/docs/skills/kernel-cache.md @@ -93,6 +93,20 @@ on cache extraction. Never omit a dracut module to work around a missing kernel feature. Changes to this contract invalidate the cache through the existing script hash and require a real kernel rebuild plus the ISO boot tests. +The contract also covers the display. `x86_64_defconfig` enables DRM and the +Intel i915 driver and nothing else, so on any other GPU, QEMU's included, the +OGC kernel registered no DRM device: GDM started, mutter had no KMS device to +open, and the gaming flavors failed the ISO test on a black screen with +`no gnome-shell running for liveuser` while `main`, on the distribution +kernel, came up through `simpledrm`. The script enables `SYSFB_SIMPLEFB` and +`DRM_SIMPLEDRM` (the firmware framebuffer as a KMS device on any hardware), +plus `DRM_VIRTIO_GPU` and `DRM_BOCHS` for VMs, and gates on `DRM_SIMPLEDRM` +like the filesystem options. Native drivers for real gaming GPUs (amdgpu, xe) +are not enabled yet: they need linux-firmware in the image, which the install +set does not carry (projectbluefin/utah#97). When diagnosing a black live +session, compare `live-serial.log` for `[drm] Initialized` lines between the +`main` and `gaming` diagnostics artifacts before reading GDM logs. + ```bash just kernel-cache-tag just check diff --git a/scripts/install-ogc-kernel.sh b/scripts/install-ogc-kernel.sh index 6565fc563..e1d8bdd86 100644 --- a/scripts/install-ogc-kernel.sh +++ b/scripts/install-ogc-kernel.sh @@ -19,10 +19,21 @@ DNF="$(command -v dnf5 || command -v dnf)" # dracut's dmsquash-live requires overlayfs and reads a zstd squashfs through # a loop device. Installed OSTree roots and the LUKS ISO test need the other # filesystem/device-mapper features too; x86 defconfig is not a live-OS config. +# +# A display, too. x86_64 defconfig turns on DRM and i915 and nothing else, so +# on any machine whose GPU is not an Intel iGPU -- every QEMU guest included -- +# the kernel registered no DRM device at all. GDM started, mutter found no KMS +# device to open, and the gaming flavors failed the ISO end-to-end test on a +# black screen with "no gnome-shell running for liveuser", while main, on the +# distribution kernel, came up through simpledrm on the firmware framebuffer. +# SYSFB_SIMPLEFB makes sysfb hand the EFI/VESA framebuffer to a +# simple-framebuffer device, and DRM_SIMPLEDRM drives it: an unaccelerated but +# real KMS device on any hardware, until a native driver takes over. required_config=(SCHED_CLASS_EXT NTSYNC ANDROID_BINDERFS OVERLAY_FS SQUASHFS SQUASHFS_ZSTD EROFS_FS BLK_DEV_LOOP ISO9660_FS BLK_DEV_DM DM_SNAPSHOT DM_CRYPT - CRYPTO_XTS FUSE_FS FS_VERITY) + CRYPTO_XTS FUSE_FS FS_VERITY + SYSFB_SIMPLEFB DRM_SIMPLEDRM) verify_config() { local config="$1" symbol for symbol in "${required_config[@]}"; do @@ -118,6 +129,14 @@ scripts/config --module OVERLAY_FS --module SQUASHFS --enable SQUASHFS_ZSTD \ --module EROFS_FS --enable BLK_DEV_LOOP --enable ISO9660_FS \ --enable BLK_DEV_DM --module DM_SNAPSHOT --module DM_CRYPT \ --module CRYPTO_XTS --module FUSE_FS --enable FS_VERITY +# The firmware framebuffer as a KMS device (see required_config above), plus +# the two paravirtual GPUs QEMU offers, so a VM gets a proper display rather +# than the boot framebuffer. Native GPU drivers for real gaming hardware +# (amdgpu, xe) are a separate decision: they need linux-firmware in the image, +# which the install set does not carry yet (projectbluefin/utah#97). +scripts/config --enable SYSFB --enable SYSFB_SIMPLEFB \ + --enable DRM --enable DRM_SIMPLEDRM \ + --module DRM_VIRTIO_GPU --module DRM_BOCHS scripts/config --set-str LOCALVERSION "-ogc1" --disable LOCALVERSION_AUTO make olddefconfig @@ -137,6 +156,7 @@ require_config() { require_config '^CONFIG_SCHED_CLASS_EXT=y$' CONFIG_SCHED_CLASS_EXT require_config '^CONFIG_NTSYNC=(y|m)$' CONFIG_NTSYNC require_config '^CONFIG_ANDROID_BINDERFS=y$' CONFIG_ANDROID_BINDERFS +require_config '^CONFIG_DRM_SIMPLEDRM=y$' CONFIG_DRM_SIMPLEDRM verify_config .config make modules_prepare diff --git a/tests/test_iso_ci.py b/tests/test_iso_ci.py index f72abf4c7..b2fcd0385 100644 --- a/tests/test_iso_ci.py +++ b/tests/test_iso_ci.py @@ -70,7 +70,7 @@ def test_ogc_config_gate_rejects_each_missing_live_boot_feature(self): names = gate.split("(", 1)[1].split(")", 1)[0].split() for required in ["OVERLAY_FS", "SQUASHFS", "SQUASHFS_ZSTD", "EROFS_FS", "BLK_DEV_LOOP", "DM_SNAPSHOT", "DM_CRYPT", "CRYPTO_XTS", - "FUSE_FS", "FS_VERITY"]: + "FUSE_FS", "FS_VERITY", "SYSFB_SIMPLEFB", "DRM_SIMPLEDRM"]: self.assertIn(required, names) self.assertRegex(script, rf"--(?:enable|module) {required}(?:\s|$)") self.assertEqual(script.count("verify_config /usr/lib/utah/ogc-kernel.config"), 2)