diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-06-05 17:46:45 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-06-12 02:58:55 +0000 |
| commit | 2964385cc6a2b015e4bf9710e998e3bfab3274d9 (patch) | |
| tree | 674229bfab0b543790590279b885bf181c9ce725 /tests | |
| parent | 0a8f6562aae253771109582caf154b3a8ccc02bc (diff) | |
| download | meta-virtualization-2964385cc6a2b015e4bf9710e998e3bfab3274d9.tar.gz | |
tests: remove redundant DISTRO_FEATURES appends from build fixtures
The -R conf files used by test build fixtures appended DISTRO_FEATURES
values that are already provided by meta-virt-host.conf (virtualization,
vcontainer, systemd). BitBake tracks append operations in task hashes,
so a duplicate append changes the hash and invalidates sstate for every
recipe that depends on DISTRO_FEATURES — causing full rebuilds even
when the image was just built.
Only append features genuinely needed by the test profile and not
already present in the base config:
- k3s: append only "k3s" (virtualization already in base)
- xen: append only "xen vxn" (virtualization systemd vcontainer in base)
- incus: no append needed (CONTAINER_PROFILE alone is sufficient)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_incus_runtime.py | 1 | ||||
| -rw-r--r-- | tests/test_k3s_runtime.py | 2 | ||||
| -rw-r--r-- | tests/test_xen_runtime.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_incus_runtime.py b/tests/test_incus_runtime.py index ea5eb1fc..4314709b 100644 --- a/tests/test_incus_runtime.py +++ b/tests/test_incus_runtime.py | |||
| @@ -70,7 +70,6 @@ def incus_image(request): | |||
| 70 | build_dir, "container-image-host", | 70 | build_dir, "container-image-host", |
| 71 | extra_vars={ | 71 | extra_vars={ |
| 72 | "CONTAINER_PROFILE": "incus", | 72 | "CONTAINER_PROFILE": "incus", |
| 73 | "DISTRO_FEATURES:append": " virtualization", | ||
| 74 | }, | 73 | }, |
| 75 | ) | 74 | ) |
| 76 | if result.returncode != 0: | 75 | if result.returncode != 0: |
diff --git a/tests/test_k3s_runtime.py b/tests/test_k3s_runtime.py index d26b9164..eb9600dd 100644 --- a/tests/test_k3s_runtime.py +++ b/tests/test_k3s_runtime.py | |||
| @@ -362,7 +362,7 @@ def k3s_image(build_dir): | |||
| 362 | build_dir, "container-image-host", | 362 | build_dir, "container-image-host", |
| 363 | extra_vars={ | 363 | extra_vars={ |
| 364 | "CONTAINER_PROFILE": "k3s-host", | 364 | "CONTAINER_PROFILE": "k3s-host", |
| 365 | "DISTRO_FEATURES:append": " k3s virtualization", | 365 | "DISTRO_FEATURES:append": " k3s", |
| 366 | }, | 366 | }, |
| 367 | ) | 367 | ) |
| 368 | if result.returncode != 0: | 368 | if result.returncode != 0: |
diff --git a/tests/test_xen_runtime.py b/tests/test_xen_runtime.py index 790a25bf..b31153bd 100644 --- a/tests/test_xen_runtime.py +++ b/tests/test_xen_runtime.py | |||
| @@ -239,7 +239,7 @@ def xen_image(build_dir): | |||
| 239 | result = _run_bitbake( | 239 | result = _run_bitbake( |
| 240 | build_dir, "xen-image-minimal", | 240 | build_dir, "xen-image-minimal", |
| 241 | extra_vars={ | 241 | extra_vars={ |
| 242 | "DISTRO_FEATURES:append": " xen vxn virtualization vcontainer systemd", | 242 | "DISTRO_FEATURES:append": " xen vxn", |
| 243 | }, | 243 | }, |
| 244 | ) | 244 | ) |
| 245 | if result.returncode != 0: | 245 | if result.returncode != 0: |
