Skip to content

test(smoke): scope extension defaults to Bluefin-classic and Dakota families - #1251

Merged
hanthor merged 1 commit into
mainfrom
test/dakota-family-extensions
Nov 16, 2026
Merged

hanthor merged 1 commit into
mainfrom
test/dakota-family-extensions

Conversation

@hanthor

@hanthor hanthor commented Nov 16, 2026

Copy link
Copy Markdown
Member

What

Adds a Dakota-family image split to the smoke suite so Bluefin-classic and Dakota desktop defaults are asserted on the right images.

  • tests/shared/image_family.py: is_dakota_family_image() matches image names dakota and utah, the images that follow Dakota's desktop defaults.
  • tests/smoke/features/environment.py: two new tags.
    • @bluefin_classic skips on Dakota-family images. It marks scenarios that assert Bluefin-classic defaults.
    • @dakota_family runs only on Dakota-family images.
    • Utah is in both the Bluefin and the Dakota family, so plain @bluefin scenarios keep running there.
  • bluefin_new_extensions.feature and copyous_stress.feature are now @bluefin_classic. They require extensions to be enabled that Dakota does not enable by default: copyous, syncthing-toggle, the Quick Settings audio hider and renamer, tailscale-qs, Bluetooth Battery Meter and tiling-assistant.
  • dakota_extensions.feature: the 11 default-enabled scenarios, which follow Dakota's elements/bluefin/shell-extensions/disable-ext-validator.bst, are now @dakota_family, so Utah asserts Dakota's default set. The installed-only scenarios keep @dakota_only, because they name Dakota-specific UUIDs: power-status-color@projectbluefin.io and syncthing-toggle@projectbluefin.io.
  • Skill docs: the suite-map tag table and the cross-image tag-skipping reference.

Why

projectbluefin/utah#1252 adopts Dakota's 11 default-enabled extensions, and the owner decided that on the PR. Utah's post-testing E2E runs smoke,common. Until this change, @bluefin scenarios required copyous, syncthing-toggle, the Quick Settings hider and renamer, and tailscale-qs to be enabled on Utah. That is seven scenarios, and they passed in utah run 43771896520. Without this change, utah#1252 turns them red. See the review on utah#1252.

Utah main already enables all 11 Dakota defaults and ships the dconf values these scenarios read: 08-dakota-extension-defaults and 04-bluefin-custom-command-menu. So the @dakota_family scenarios hold on Utah both before and after #1252. Of the 11, eight already pass on Utah through bluefin_extensions.feature (smoke-a results.json of the run above). The remaining three are fuzzy-application-search, BudsLink-Companion and tilingshell, plus the dconf assertions. They have not run on Utah yet. Utah's build-time verify-gnome-extensions.py checks that those three are installed. [INFERENCE: they enable at runtime as on Dakota.]

Refs projectbluefin/utah#1252

Overlap

These PRs touch the same files:

The hunks don't overlap textually except the suite-map tag table. Whichever lands second rebases.

Verification

Run locally with the same pip set as unit-tests.yml:

  • ruff check tests/ --select E,F,W --ignore E501
  • python3 -m pytest tests/unit/ -q -n auto
  • python3 scripts/validate_docs.py
  • python3 scripts/generate_skill_index.py --check
  • python3 scripts/update_coverage_snapshot.py --check
  • behave --dry-run tests/smoke/features

New unit tests:

  • test_dakota_family_follows_dakota_defaults_by_image_name
  • the smoke _detect_image_family flag
  • test_family_tags_scope_scenarios_to_their_image_family, which covers both tags on both families

…amilies

Utah follows Dakota's 11 default-enabled GNOME Shell extensions
(projectbluefin/utah#1252), but it is also a Bluefin-family image, so
@bluefin smoke scenarios that require copyous, syncthing-toggle, the
Quick Settings audio hider/renamer and tailscale-qs to be enabled ran
on it and would fail once those defaults are dropped.

Add is_dakota_family_image() (dakota, utah) and two smoke tags:
@bluefin_classic skips on Dakota-family images, @dakota_family runs only
on them. Tag bluefin_new_extensions.feature and copyous_stress.feature
@bluefin_classic, and make the default-enabled half of
dakota_extensions.feature @dakota_family so Utah asserts Dakota's set.
The installed-only checks name Dakota-specific UUIDs and stay
@dakota_only.

Refs projectbluefin/utah#1252

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 94.44444% with 2 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
tests/smoke/features/environment.py 87.50% 2 Missing ⚠️

📢 Thoughts on this report? Let us know!

Merged via the queue into main with commit ecd519d Nov 16, 2026
17 checks passed
@hivecommons-hive hivecommons-hive Bot added author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 16, 2026
hanthor added a commit to projectbluefin/utah that referenced this pull request Nov 16, 2026
projectbluefin/testsuite#1251 scopes the Bluefin-classic default-extension
scenarios away from Dakota-family images (utah, dakota) and runs Dakota's
11 default-extension checks on them instead, so this PR's switch to
Dakota's default set no longer fails post-testing E2E.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hanthor added a commit to projectbluefin/utah that referenced this pull request Nov 16, 2026
projectbluefin/testsuite#1251 scopes the Bluefin-classic default-extension
scenarios away from Dakota-family images (utah, dakota) and runs Dakota's
11 default-extension checks on them instead, so this PR's switch to
Dakota's default set no longer fails post-testing E2E.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hanthor added a commit to projectbluefin/utah that referenced this pull request Nov 16, 2026
projectbluefin/testsuite#1251 scopes the Bluefin-classic default-extension
scenarios away from Dakota-family images (utah, dakota) and runs Dakota's
11 default-extension checks on them instead, so this PR's switch to
Dakota's default set no longer fails post-testing E2E.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hanthor added a commit to projectbluefin/utah that referenced this pull request Nov 16, 2026
projectbluefin/testsuite#1251 scopes the Bluefin-classic default-extension
scenarios away from Dakota-family images (utah, dakota) and runs Dakota's
11 default-extension checks on them instead, so this PR's switch to
Dakota's default set no longer fails post-testing E2E.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
hanthor added a commit to projectbluefin/utah that referenced this pull request Nov 16, 2026
…pd, parity target, firewall/DNS) (#1248)

* feat(power): use power-profiles-daemon like Dakota, drop TuneD

Dakota (projectbluefin/dakota, gnome-build-meta core-deps) backs GNOME's
power-mode switch with power-profiles-daemon and ships neither TuneD,
tuned-ppd nor intel-lpmd. Utah now does the same:

- install power-profiles-daemon (factory import utah-packages#999) and
  enable it in the preset, configure-services.sh and the desktop contract.
  Today tuned-ppd arrives unrequested through gnome-control-center's
  `Recommends: ppd-service` (it was the only provider); PPD provides and
  conflicts with ppd-service, so requesting it keeps tuned-ppd out
- drop intel-lpmd and its enablement; thermald stays, as on Dakota
- remove the TuneD workarounds: the utah-bootc-kargs-off post-loaded
  profile (PPD has no bootloader plugin, so nothing calls bootc on a
  profile switch), the /var/log/tuned tmpfiles entry and its test
- waive tuned and tuned-ppd in baselines/triage.toml

Needs a PACKAGE_IMAGE_SHA bump to a factory publish that carries
power-profiles-daemon before the image build resolves it.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(services): follow Dakota's service presets

Dakota (projectbluefin/dakota, testing) is Utah's parity target. Align the
system and user presets with what it ships:

- sysstat collection is opt-in. Dakota's elements/bluefin/sysstat.bst writes
  80-sysstat.preset disabling sysstat.service, sysstat-collect.timer,
  sysstat-summary.timer and sysstat-rotate.timer. Utah drops the Fedora-derived
  enables, presets all four off, disables them in configure-services.sh and
  holds them in the desktop contract's disabled list. The package stays for
  on-demand sar/iostat.
- colord.service and accounts-daemon.service are enabled, as Dakota inherits
  them from gnome-build-meta's files/systemd-presets/system-preset/80-gnome.preset.
- speech-dispatcher.socket and xdg-desktop-portal-rewrite-launchers.service are
  globally enabled user units, from gnome-build-meta's user-preset
  80-speechd.preset and 80-xdg.preset.

Preset, configure-services.sh and contracts/bluefin-desktop.toml are wired for
every unit, with tests pinning the agreement; the desktop-contract and
factory-consumption skill docs follow.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(desktop): adopt Dakota system defaults and logind sleep defaults

Copy Dakota's (projectbluefin/dakota, branch testing) small system
defaults into Utah:

- usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf from
  files/wireplumber/ (elements/bluefin/wireplumber-pcsp.bst) hides the
  PC-speaker ALSA card so it cannot become the default sink after resume
  (projectbluefin/dakota#1248).
- usr/lib/sysctl.d/60-kexec-disable.conf from
  elements/bluefin/kexec-disable.bst sets kernel.kexec_load_disabled = 1.

Dakota's files/polkit/org.freedesktop.NetworkManager.rules is already
shipped, with an identical rule, by Hummingbird's NetworkManager RPM at
/usr/share/polkit-1/rules.d/, so Utah asserts it in the desktop
contract instead of overlaying the package-owned file.

Drop the suspend-then-hibernate logind override inherited from
bluefin-lts's 40-services.sh. Dakota ships no logind or sleep override,
and Utah's only swap is zram, so hibernate had no resume target. Lid and
sleep actions now use systemd-logind's defaults (suspend).

The desktop contract asserts all three files and their key settings;
the desktop-contract skill documents them.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(uupd): match Dakota's uupd element

Dakota (projectbluefin/dakota@testing, elements/bluefin/uupd.bst) installs
uupd v1.5.5 and ships uupd-manual.service, a polkit rule letting users start
uupd.service and uupd-manual.service, and /etc/uupd/config.json with the
hardware checks enabled. Utah pinned v1.4.0 and had none of the three.

- Containerfile: UUPD_VERSION v1.5.5 with the new x86_64 tarball digest
  (matches Dakota's ref and the release's checksums.txt). The raw
  uupd.service and uupd.timer at v1.5.5 are byte-identical to v1.4.0, so
  their digests stay. Dakota writes those units inline, but they equal
  upstream's plus --disable-module-distrobox, which configure-services.sh
  already adds, so Utah keeps downloading them.
- system_files: Dakota's uupd-manual.service, /etc/polkit-1/rules.d/uupd.rules
  and /etc/uupd/config.json (identical to upstream v1.5.5). The config
  overrides Common's distrobox-only /etc/uupd/config.json, and the
  downloaded uupd.timer (daily 04:00) replaces Common's four-a-day timer.
  Dakota resolves the same overlap the same way: BuildStream orders the
  stack's unrelated deps by name, so bluefin/uupd.bst stages after
  bluefin/common.bst and wins.
- contracts/bluefin-desktop.toml requires the uupd files and pins the
  timer schedule, service flag and hardware-check config; a test covers it.
- baselines: the uupd waiver no longer claims uupd-manual.service is missing
  from Utah's sources; GAP.md regenerated.
- docs/skills: containerfile and desktop-contract describe the Dakota pin.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(desktop): adopt Dakota's extension, Flatpak and launcher defaults

Align Utah's desktop defaults with projectbluefin/dakota (testing):

- Default-enabled GNOME Shell extensions are now exactly Dakota's 11, in
  Dakota's order (elements/bluefin/shell-extensions/disable-ext-validator.bst).
  The audio-device hider/renamer, Tailscale QS, Copyous and the Syncthing
  toggle stay installed but opt-in; submodules are untouched. The contract
  pins the effective value via [gsettings.values] instead of asserting the
  five extra UUIDs, and a unit test keeps override, contract and shipped
  UUIDs in step.
- Fix Tiling Shell's Quarters layout: three of its four tiles were the
  bottom-right quadrant. Copy layouts-json from Dakota's
  files/dconf/08-dakota-extension-defaults and pin the quadrants in the
  contract.
- Preinstall BudsLink (backing the enabled BudsLink-Companion extension):
  add the preinstall entry (Dakota files/oci/bluefin-flatpak/preinstall.d/)
  and append it to common's system-flatpaks.Brewfile in
  configure-services.sh, as Dakota's elements/bluefin/common.bst does.
- Apply Dakota's common.bst edits: drop common's system-update, discourse
  and documentation launchers (Control Center covers them; the
  Documentation launcher opened a PDF Utah does not ship) and ship
  /etc/profile.d/bluefin-shell-defaults.sh defaulting
  BLUEFIN_SHELL_ENABLE_MOTD=0.

Docs: docs/skills/desktop-contract.md and its extension-schemas reference.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(parity): make Dakota the only parity target

Utah's parity target moves from Bluefin classic (ublue bluefin:stable and
projectbluefin/bluefin base.toml) to projectbluefin/dakota
(ghcr.io/projectbluefin/dakota:testing). Structural differences are tracked
under #1236 and its children #1222-#1235.

- Freeze the manifest: packages/bluefin.toml becomes packages/base.toml, a
  Utah-owned base manifest frozen from projectbluefin/bluefin@bb63fd16
  (2026-09-17) and edited by hand. Content and sections are unchanged; every
  consumer (Containerfile, install/verify/repo-availability scripts, site
  data, package snapshot, Justfile, pages.yml, tests, docs) uses the new path.
- Delete the Bluefin-classic sync machinery: .bluefin-parity-ref, the
  check-parity recipe and the build.yml "Check Bluefin parity" step,
  update-bluefin-parity.yml, audit-bluefin-parity.py with its recipes,
  baseline and tests.
- Baselines measure Dakota vs Utah only. image-baseline.py extract works on
  an image without rpm and attributes each Dakota file to a guessed element
  (elements.tsv names plus an alias table); gap/check compare Dakota's
  user-visible paths with Utah's surface, grouped by item. baselines/bluefin
  is gone; baselines/dakota/surface.tsv is measured from dakota:testing and
  elements.tsv refreshed from publish.yml run 43552592054.
- triage.toml is rewritten for the 264 Dakota items: epic children for the
  structural moves, waivers for GNOME OS/BuildStream internals and
  Flatpak-first apps, #1236 for apps and tools Utah should ship, and the
  remaining libraries and SDK tools untriaged by area.
- `just baselines` and image-baselines.yml measure dakota:testing and
  utah:testing only. The site group and doc counts read "base manifest".
- AGENTS.md, README, SKILL router, package-contract, ci-workflows,
  docs-parity, containerfile, desktop-contract skills and references,
  baselines/README, utah.toml headers and the site describe Dakota as the
  target and base.toml as Utah-owned.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(services): run the units a booted Dakota runs

Dakota (GNOME OS) has no system `disable *` preset: every installed unit
with [Install] is on unless a preset turns it off. Hummingbird's
99-default-disable inverts that, so Utah left many daemons off that a
booted Dakota runs. Measured by running `systemctl --root=/ preset-all`
inside ghcr.io/projectbluefin/dakota:testing and utah:testing and
diffing `list-unit-files`, this enables every unit Utah ships that
Dakota has enabled: rtkit, upower, udisks2, polkit's agent socket,
cups.service, pcscd.socket, gnome-remote-desktop, malcontent's timer and
web filter, systemd-oomd, wpa_supplicant.service, rootful podman's
socket and timers, and upstream systemd's sysext/storage/factory-reset/
pcrextend sockets and credential loaders. multipathd and lm_sensors,
which Dakota does not run, are disabled.

systemd-oomd is enabled without systemd-oomd-defaults, as on Dakota,
which ships no ManagedOOM drop-ins. os-release gains Dakota's
VENDOR_NAME and VENDOR_URL.

The skill-doc sync test now also reads the Dakota service reference,
which holds the long unit list so desktop-contract.md stays under its
500-line limit.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* feat(network): GNOME OS firewall zone and fallback DNS, as on Dakota

Dakota inherits two network defaults from gnome-build-meta that Utah
lacked:

- firewall: gnomeos-deps/firewalld.bst ships the lax zone (ssh, mDNS,
  Samba client, DHCPv6 client, TCP/UDP 1025-65535, forwarding) and
  edits firewalld.conf to DefaultZone=lax, IPv6_rpfilter=loose. Utah
  defaulted to public with strict rpfilter, which blocked GSConnect,
  Steam and LAN games. gnome-os-config-firewalld ships the zone;
  configure-services.sh applies the two edits through firewalld's
  variant symlink.
- fallback DNS: core-deps/systemd-base.bst compiles Cloudflare's
  resolvers into systemd-resolved; Fedora's build has none.
  gnome-os-config-resolved-fallback-dns carries the same list as a
  resolved.conf.d drop-in.

Both subpackages come from projectbluefin/utah-packages#1018, so the
image build needs a PACKAGE_IMAGE_SHA that publishes them. Verified on
the Hummingbird base: firewall-offline-cmd reports lax as the default
zone, with 1025-65535/tcp+udp open, and the symlink is kept.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* ci(e2e): pin the testsuite with Dakota-family extension scenarios

projectbluefin/testsuite#1251 scopes the Bluefin-classic default-extension
scenarios away from Dakota-family images (utah, dakota) and runs Dakota's
11 default-extension checks on them instead, so this PR's switch to
Dakota's default set no longer fails post-testing E2E.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore(deps): pin the factory image that publishes the Dakota config packages

sha256:0b0664cb carries power-profiles-daemon, uresourced, nss-mdns and
the dakota-config / gnome-os-config subpackages (utah-packages#1018),
which this stack installs. The factory-pin stamp moves with it so the
package transaction layer rebuilds (#371).

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix(contract): do not require colord.service to be enabled

The factory's colord ships colord.service without an [Install] section
(D-Bus activated), so `systemctl enable` is a no-op and the desktop
contract's 'required service is not enabled' check failed the nvidia,
gaming and nvidia-gaming image builds on #1248.

Assisted-by: Claude Opus via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants