diff --git a/.pipelines/templates/stages/azl_installer/azl-installer.yml b/.pipelines/templates/stages/azl_installer/azl-installer.yml index e9e8d93f2d..cc7d807c53 100644 --- a/.pipelines/templates/stages/azl_installer/azl-installer.yml +++ b/.pipelines/templates/stages/azl_installer/azl-installer.yml @@ -76,15 +76,15 @@ stages: - bash: | set -ex - mkdir -p tests/tailor-images/azl-installer/iso/bin - mkdir -p tests/tailor-images/azl-installer/iso/images + mkdir -p tests/images/azl-installer/iso/bin + mkdir -p tests/images/azl-installer/iso/images # Move liveinstaller to bin directory - mv "$(Build.ArtifactStagingDirectory)/installer-tools/liveinstaller" tests/tailor-images/azl-installer/iso/bin/ - chmod +x tests/tailor-images/azl-installer/iso/bin/liveinstaller + mv "$(Build.ArtifactStagingDirectory)/installer-tools/liveinstaller" tests/images/azl-installer/iso/bin/ + chmod +x tests/images/azl-installer/iso/bin/liveinstaller # Move .cosi file to the ISO directory. When there are clones (multiple .cosi files), we pick the first one. - mv $(ls $(Build.ArtifactStagingDirectory)/testimage/*.cosi | head -n 1) tests/tailor-images/azl-installer/iso/images/trident-testimage.cosi + mv $(ls $(Build.ArtifactStagingDirectory)/testimage/*.cosi | head -n 1) tests/images/azl-installer/iso/images/trident-testimage.cosi displayName: "Prepare installer dependencies" workingDirectory: $(TRIDENT_SOURCE_DIR) diff --git a/.pipelines/templates/stages/build_image/build-image-template.yml b/.pipelines/templates/stages/build_image/build-image-template.yml index 2243590618..dda74ba0b8 100644 --- a/.pipelines/templates/stages/build_image/build-image-template.yml +++ b/.pipelines/templates/stages/build_image/build-image-template.yml @@ -305,19 +305,19 @@ steps: ;; esac - manifest_path=tests/tailor-images/tailor.yaml + manifest_path=tests/images/tailor.yaml if [[ "${{ parameters.micBuildType }}" == "dev" ]]; then - manifest_path=tests/tailor-images/.tailor.pipeline.yaml + manifest_path=tests/images/.tailor.pipeline.yaml python3 - <<'PY' from pathlib import Path - text = Path('tests/tailor-images/tailor.yaml').read_text() + text = Path('tests/images/tailor.yaml').read_text() needle = 'toolchains:\n default: ic\n entries:\n - name: ic\n container: mcr.microsoft.com/azurelinux/imagecustomizer\n tag: latest\n' replacement = 'toolchains:\n default: ic-dev\n entries:\n - name: ic\n container: mcr.microsoft.com/azurelinux/imagecustomizer\n tag: latest\n - name: ic-dev\n container: imagecustomizer\n tag: dev\n pull: never\n' - Path('tests/tailor-images/.tailor.pipeline.yaml').write_text(text.replace(needle, replacement, 1)) + Path('tests/images/.tailor.pipeline.yaml').write_text(text.replace(needle, replacement, 1)) PY fi - rm -f tests/tailor-images/artifacts/ca_cert.pem + rm -f tests/images/artifacts/ca_cert.pem cargo run --manifest-path tools/tailor/Cargo.toml --quiet -- \ -vvv \ --log-dir $(ob_outputDirectory)/tailor-logs \ @@ -340,10 +340,10 @@ steps: "$(ob_outputDirectory)/${legacy_name}.${artifact_ext}" fi - if [ -f tests/tailor-images/artifacts/ca_cert.pem ]; then - cp tests/tailor-images/artifacts/ca_cert.pem "$(ob_outputDirectory)/ca_cert.pem" + if [ -f tests/images/artifacts/ca_cert.pem ]; then + cp tests/images/artifacts/ca_cert.pem "$(ob_outputDirectory)/ca_cert.pem" fi - rm -f tests/tailor-images/.tailor.pipeline.yaml + rm -f tests/images/.tailor.pipeline.yaml displayName: "Build ${{ parameters.imageName }}" workingDirectory: ${{ parameters.tridentSourceDirectory }} diff --git a/.pipelines/templates/stages/trident_images/trident-testimg-template.yml b/.pipelines/templates/stages/trident_images/trident-testimg-template.yml index 3b6a33026d..99442a4520 100644 --- a/.pipelines/templates/stages/trident_images/trident-testimg-template.yml +++ b/.pipelines/templates/stages/trident_images/trident-testimg-template.yml @@ -135,7 +135,7 @@ steps: displayName: Copy SSH Keys - script: | - echo "##[warning]THE PIPELINE TEMPLATE trident-testimg-template.yaml IS DEPRECATED. PLEASE SWITCH TO USING the tailor workspace under tests/tailor-images." + echo "##[warning]THE PIPELINE TEMPLATE trident-testimg-template.yaml IS DEPRECATED. PLEASE SWITCH TO USING the tailor workspace under tests/images." cat /etc/os-release displayName: "Report Host Info" @@ -325,9 +325,9 @@ steps: # downloadable artifact too) is still available for diagnosing the failure. - script: | set -ex - if [ -d "tests/tailor-images/artifacts/tailor-logs" ]; then + if [ -d "tests/images/artifacts/tailor-logs" ]; then mkdir -p "${{ parameters.outputDirectory }}/tailor-logs" - sudo cp -rv tests/tailor-images/artifacts/tailor-logs/. "${{ parameters.outputDirectory }}/tailor-logs/" + sudo cp -rv tests/images/artifacts/tailor-logs/. "${{ parameters.outputDirectory }}/tailor-logs/" fi workingDirectory: ${{ parameters.tridentSourceDirectory }} displayName: "Copy tailor logs to output directory" diff --git a/Makefile b/Makefile index b5f3b9a870..945527ef1d 100644 --- a/Makefile +++ b/Makefile @@ -538,7 +538,7 @@ generate-functional-test-manifest: .cargo/config .PHONY: validate-configs validate-configs: target/release/trident - $(eval DETECTED_HC_FILES := $(shell grep -R '^storage:' . --include '*.yaml' -l | grep -E -v '\./(target|dev|azure-linux-image-tools|crates/docbuilder|tests/tailor-images|tests/images|tests/azl-installer)')) + $(eval DETECTED_HC_FILES := $(shell grep -R '^storage:' . --include '*.yaml' -l | grep -E -v '\./(target|dev|azure-linux-image-tools|crates/docbuilder|tests/images|tests/images|tests/azl-installer)')) @for file in $(DETECTED_HC_FILES); do \ echo "Validating $$file"; \ $< validate $$file -v info || exit 1; \ @@ -627,13 +627,13 @@ run-attendedinstaller-simulator: bin/attendedinstaller-simulator # Test image paths ARTIFACTS_TEST_IMAGE_DIR := artifacts/test-image -AZL_INSTALLER_DIR := tests/tailor-images/azl-installer +AZL_INSTALLER_DIR := tests/images/azl-installer AZL_INSTALLER_ISO_DIR := $(AZL_INSTALLER_DIR)/iso # If regular.cosi is not present, download runtime images $(ARTIFACTS_TEST_IMAGE_DIR)/regular.cosi: download-runtime-images -include tests/tailor-images/targets.mk +include tests/images/targets.mk .PHONY: validate validate: $(TRIDENT_CONFIG) target/release/trident @@ -931,7 +931,7 @@ download-trident-container-installer-iso: # TRIDENT VM UPDATE IMAGES -VM_IMAGE_PATH_PREFIX = tests/tailor-images/trident-vm-testimage/base +VM_IMAGE_PATH_PREFIX = tests/images/trident-vm-testimage/base artifacts/rpm-overrides: @mkdir -p artifacts/rpm-overrides @@ -966,12 +966,12 @@ $(QEMU_GUEST_IMAGE): BAREMETAL_IMAGE = artifacts/baremetal.vhdx $(BAREMETAL_IMAGE): @mkdir -p artifacts - $(CARGO_TAILOR) run --manifest-path tools/tailor/Cargo.toml --quiet -- --manifest tests/tailor-images/tailor.yaml bases download baremetal + $(CARGO_TAILOR) run --manifest-path tools/tailor/Cargo.toml --quiet -- --manifest tests/images/tailor.yaml bases download baremetal CORE_SELINUX_IMAGE = artifacts/core_selinux.vhdx $(CORE_SELINUX_IMAGE): @mkdir -p artifacts - $(CARGO_TAILOR) run --manifest-path tools/tailor/Cargo.toml --quiet -- --manifest tests/tailor-images/tailor.yaml bases download core_selinux + $(CARGO_TAILOR) run --manifest-path tools/tailor/Cargo.toml --quiet -- --manifest tests/images/tailor.yaml bases download core_selinux CORE_ARM64_IMAGE_NAME ?= core_vhdx-arm64-3.0-stable CORE_ARM64_IMAGE_VERSION ?= * diff --git a/docs/Development/Testing/E2E-Tests.md b/docs/Development/Testing/E2E-Tests.md index 6fd203ff61..dccdddc451 100644 --- a/docs/Development/Testing/E2E-Tests.md +++ b/docs/Development/Testing/E2E-Tests.md @@ -132,7 +132,7 @@ make bin/rcp-agent # Remote control plane agent ### 4. Build Trident RPMs The **host** test images include Trident packages built from your local tree. -This step builds the RPMs into `bin/RPMS/`, which the `tests/tailor-images` tailor +This step builds the RPMs into `bin/RPMS/`, which the `tests/images` tailor workspace passes to Image Customizer via `rpmSources:`: ```bash @@ -168,7 +168,7 @@ make artifacts/id_rsa ### 7. Download Base Image ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml bases download baremetal +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml bases download baremetal ``` ### 8. Build COSI Images @@ -193,7 +193,7 @@ mkdir -p artifacts/test-image # Build two clones (produces trident-testimage_amd64_cosi_clone0.cosi and # trident-testimage_amd64_cosi_clone1.cosi) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts/test-image --clones 2 # Rename clones to the filenames referenced by Host Configurations mv artifacts/test-image/trident-testimage_amd64_cosi_clone0.cosi artifacts/test-image/regular.cosi @@ -204,12 +204,12 @@ Repeat for other image types as needed: ```bash # Verity image (for root-verity configuration) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=root --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=root --output-dir ./artifacts/test-image --clones 2 mv artifacts/test-image/trident-verity-testimage_host_root_amd64_cosi_clone0.cosi artifacts/test-image/verity.cosi mv artifacts/test-image/trident-verity-testimage_host_root_amd64_cosi_clone1.cosi artifacts/test-image/verity_v2.cosi # UKI/usr-verity image (for usr-verity, combined configurations) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=usr --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=usr --output-dir ./artifacts/test-image --clones 2 mv artifacts/test-image/trident-verity-testimage_host_usr_amd64_cosi_clone0.cosi artifacts/test-image/usrverity.cosi mv artifacts/test-image/trident-verity-testimage_host_usr_amd64_cosi_clone1.cosi artifacts/test-image/usrverity_v2.cosi ``` @@ -225,23 +225,23 @@ URLs work unchanged: mkdir -p artifacts/test-image # Regular container image -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-container-testimage --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-container-testimage --output-dir ./artifacts/test-image --clones 2 mv artifacts/test-image/trident-container-testimage_amd64_cosi_clone0.cosi artifacts/test-image/regular.cosi mv artifacts/test-image/trident-container-testimage_amd64_cosi_clone1.cosi artifacts/test-image/regular_v2.cosi # Verity container image (for root-verity configuration) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=root --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=root --output-dir ./artifacts/test-image --clones 2 mv artifacts/test-image/trident-verity-testimage_container_root_amd64_cosi_clone0.cosi artifacts/test-image/verity.cosi mv artifacts/test-image/trident-verity-testimage_container_root_amd64_cosi_clone1.cosi artifacts/test-image/verity_v2.cosi # UKI/usr-verity container image (for usr-verity, combined configurations) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=usr --output-dir ./artifacts/test-image --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=usr --output-dir ./artifacts/test-image --clones 2 mv artifacts/test-image/trident-verity-testimage_container_usr_amd64_cosi_clone0.cosi artifacts/test-image/usrverity.cosi mv artifacts/test-image/trident-verity-testimage_container_usr_amd64_cosi_clone1.cosi artifacts/test-image/usrverity_v2.cosi ``` The workspace defaults to the Image Customizer container declared in -`tests/tailor-images/tailor.yaml` (`mcr.microsoft.com/azurelinux/imagecustomizer:latest`). +`tests/images/tailor.yaml` (`mcr.microsoft.com/azurelinux/imagecustomizer:latest`). ### 9. Build the Installer ISO diff --git a/docs/Development/Testing/Functional-Tests.md b/docs/Development/Testing/Functional-Tests.md index a295dc6541..c90e39f0e3 100644 --- a/docs/Development/Testing/Functional-Tests.md +++ b/docs/Development/Testing/Functional-Tests.md @@ -47,19 +47,19 @@ and a base image also from MCR. 1. **Download the base image:** ```bash - cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml bases download baremetal + cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml bases download baremetal ``` 2. **Build the functional test image:** ```bash - cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-functest --output-dir ./artifacts + cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-functest --output-dir ./artifacts ``` This produces `artifacts/trident-functest_amd64_qcow2.qcow2` (tailor publishes under the cell's slug; use `make artifacts/trident-functest.qcow2` for the legacy-named compatibility output). The image is selected from - the `trident-functest` family in `tests/tailor-images/tailor.yaml`. + the `trident-functest` family in `tests/images/tailor.yaml`. ## Building Test Dependencies diff --git a/docs/Development/Testing/Rollback-Tests.md b/docs/Development/Testing/Rollback-Tests.md index d6314dd607..9a6764d8ae 100644 --- a/docs/Development/Testing/Rollback-Tests.md +++ b/docs/Development/Testing/Rollback-Tests.md @@ -7,7 +7,7 @@ sidebar_position: 8 Rollback tests validate manual rollback and runtime update workflows using `storm-trident run rollback`. Like [servicing tests](Servicing-Tests.md), they start from a pre-built VM image defined in -`tests/tailor-images/trident-vm-testimage/`, but focus specifically on the rollback +`tests/images/trident-vm-testimage/`, but focus specifically on the rollback chain: A/B updates, runtime updates (sysexts and netplan), and rolling each back in sequence. @@ -21,7 +21,7 @@ extensions: | `trident-vm-usr-verity-testimage` | systemd-boot | `/usr` verity | Yes | Sysexts supported | Required | | `trident-vm-grub-verity-testimage` | grub2 | Root verity | No | Not supported | Not needed | -All image configs live under `tests/tailor-images/trident-vm-testimage/`: the +All image configs live under `tests/images/trident-vm-testimage/`: the matrix is defined in `image.yaml`, and each scenario's specific configuration lives under `by-scenario/` (e.g. `by-scenario/usr-verity.yaml` and `by-scenario/grub-verity.yaml`). The base image is `qemu_guest` (see diff --git a/docs/Development/Testing/Servicing-Tests.md b/docs/Development/Testing/Servicing-Tests.md index b087e7f5d9..0c603c7899 100644 --- a/docs/Development/Testing/Servicing-Tests.md +++ b/docs/Development/Testing/Servicing-Tests.md @@ -10,7 +10,7 @@ Servicing tests validate multi-update workflows on pre-built VM images using from a QCOW2 image that already has Trident and an OS installed, then run repeated A/B updates with optional rollback testing. -The VM images are defined in `tests/tailor-images/trident-vm-testimage/` and built +The VM images are defined in `tests/images/trident-vm-testimage/` and built with Image Customizer from a `qemu_guest` base image downloaded from MCR. ## VM Image Types @@ -24,7 +24,7 @@ image types are: | `trident-vm-grub-verity-testimage` | grub2 | Root verity | No | `by-scenario/grub-verity-base.yaml` (base), `by-scenario/grub-verity.yaml` (update) | | `trident-vm-usr-verity-testimage` | systemd-boot | `/usr` verity | Yes | `by-scenario/usr-verity.yaml` | -All image configs live under `tests/tailor-images/trident-vm-testimage/`: the +All image configs live under `tests/images/trident-vm-testimage/`: the matrix is defined in `image.yaml`, and each scenario's specific configuration lives under `by-scenario/`. The base image is `qemu_guest` (see [step 4](#4-download-the-qemu_guest-base-image) for how to obtain it). @@ -106,7 +106,7 @@ step, so the base image's pre-installed package set does not matter. :::tip Internal shortcut If you have access to the internal Azure DevOps artifacts feed, the Makefile downloads `qemu_guest` automatically (requires `az login`). You can also -download it directly: `cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml bases download qemu_guest` +download it directly: `cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml bases download qemu_guest` ::: ### 5. Build the VM Image @@ -139,7 +139,7 @@ mkdir -p artifacts/update-a artifacts/update-b mkdir -p artifacts/rpm-overrides # Build two clones of the COSI image -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-vm-testimage -s arch=amd64 -s scenario=grub-verity --output-dir ./artifacts --clones 2 +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-vm-testimage -s arch=amd64 -s scenario=grub-verity --output-dir ./artifacts --clones 2 # Move the clones into the update directories with the same filename mv artifacts/trident-vm-testimage_amd64_grub-verity_cosi_clone0.cosi artifacts/update-a/trident-vm-grub-verity-testimage.cosi diff --git a/docs/Development/Testing/Testing.md b/docs/Development/Testing/Testing.md index 31f8583137..af053c47fc 100644 --- a/docs/Development/Testing/Testing.md +++ b/docs/Development/Testing/Testing.md @@ -47,7 +47,7 @@ See [E2E Tests](E2E-Tests.md) for full setup and run instructions. ## Servicing and Rollback Testing Servicing and rollback tests use pre-built VM images (defined in -`tests/tailor-images/trident-vm-testimage/`) to test multi-update workflows and +`tests/images/trident-vm-testimage/`) to test multi-update workflows and manual rollback chains without using `netlaunch` or an installer ISO. - [Servicing Tests](Servicing-Tests.md) — multi-update loop with optional diff --git a/docs/Explanation/Trident-ACL-Agent.md b/docs/Explanation/Trident-ACL-Agent.md index 93689c959a..35e7862871 100644 --- a/docs/Explanation/Trident-ACL-Agent.md +++ b/docs/Explanation/Trident-ACL-Agent.md @@ -29,7 +29,7 @@ files. Installing the package does not by itself enable or start the service — a deployment decides when that happens, e.g. by running `systemctl enable --now trident-acl-agent.service` on the node, or by baking that enablement into the image build (as this repo's own -`tests/tailor-images/trident-vm-testimage/by-scenario/acl-agent.yaml` Tailor image config does via +`tests/images/trident-vm-testimage/by-scenario/acl-agent.yaml` Tailor image config does via Image Customizer's `services: enable` list). The shipped unit carries no `Environment=` lines beyond `ExecStart`, so diff --git a/tests/tailor-images/README.md b/tests/images/README.md similarity index 73% rename from tests/tailor-images/README.md rename to tests/images/README.md index 804b5aaeda..55020c9b03 100644 --- a/tests/tailor-images/README.md +++ b/tests/images/README.md @@ -1,6 +1,6 @@ # Test images with tailor -`tests/tailor-images/` is a [tailor](../../tools/tailor/README.md) workspace. +`tests/images/` is a [tailor](../../tools/tailor/README.md) workspace. It replaces the legacy `testimages.py` / `builder/` flow -- no Make target or pipeline invokes it anymore, though its files remain on disk until a follow-up cleanup PR removes them. @@ -10,7 +10,7 @@ cleanup PR removes them. Use the in-tree tailor binary via Cargo: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml matrix trident-installer --format json +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml matrix trident-installer --format json ``` Build examples: @@ -22,31 +22,31 @@ Build examples: mkdir -p artifacts/rpm-overrides # trident-testimage -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts # trident-testimage-arm64 -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-testimage -s arch=arm64 --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-testimage -s arch=arm64 --output-dir ./artifacts # trident-direct-streaming-installer-arm64 -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-installer -s arch=arm64 -s variant=direct-streaming --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-installer -s arch=arm64 -s variant=direct-streaming --output-dir ./artifacts # trident-container-usrverity-testimage (signed) -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=usr --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=container -s mode=usr --output-dir ./artifacts ``` ## Base images -The workspace uses a `baseImages:` catalogue in `tests/tailor-images/tailor.yaml`. +The workspace uses a `baseImages:` catalogue in `tests/images/tailor.yaml`. For the Azure Linux base slots you can materialize the defaults locally with: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml bases download baremetal core_arm64 core_selinux qemu_guest +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml bases download baremetal core_arm64 core_selinux qemu_guest ``` Verify that every referenced base file exists: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml bases verify +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml bases verify ``` Ubuntu / GB200 direct-streaming inputs still come from the pipeline-managed blob diff --git a/tests/tailor-images/azl-installer/image.yaml b/tests/images/azl-installer/image.yaml similarity index 100% rename from tests/tailor-images/azl-installer/image.yaml rename to tests/images/azl-installer/image.yaml diff --git a/tests/tailor-images/azl-installer/installer-iso.yaml b/tests/images/azl-installer/installer-iso.yaml similarity index 100% rename from tests/tailor-images/azl-installer/installer-iso.yaml rename to tests/images/azl-installer/installer-iso.yaml diff --git a/tests/tailor-images/azl-installer/iso/.gitignore b/tests/images/azl-installer/iso/.gitignore similarity index 100% rename from tests/tailor-images/azl-installer/iso/.gitignore rename to tests/images/azl-installer/iso/.gitignore diff --git a/tests/tailor-images/azl-installer/iso/files/config-placeholder.yaml b/tests/images/azl-installer/iso/files/config-placeholder.yaml similarity index 100% rename from tests/tailor-images/azl-installer/iso/files/config-placeholder.yaml rename to tests/images/azl-installer/iso/files/config-placeholder.yaml diff --git a/tests/tailor-images/azl-installer/mos/scripts/installation.sh b/tests/images/azl-installer/mos/scripts/installation.sh similarity index 100% rename from tests/tailor-images/azl-installer/mos/scripts/installation.sh rename to tests/images/azl-installer/mos/scripts/installation.sh diff --git a/tests/tailor-images/azl-installer/mos/scripts/startup-command.sh b/tests/images/azl-installer/mos/scripts/startup-command.sh similarity index 100% rename from tests/tailor-images/azl-installer/mos/scripts/startup-command.sh rename to tests/images/azl-installer/mos/scripts/startup-command.sh diff --git a/tests/tailor-images/azurelinux-direct-streaming-testimage/by-arch/arm64.yaml b/tests/images/azurelinux-direct-streaming-testimage/by-arch/arm64.yaml similarity index 100% rename from tests/tailor-images/azurelinux-direct-streaming-testimage/by-arch/arm64.yaml rename to tests/images/azurelinux-direct-streaming-testimage/by-arch/arm64.yaml diff --git a/tests/tailor-images/azurelinux-direct-streaming-testimage/image.yaml b/tests/images/azurelinux-direct-streaming-testimage/image.yaml similarity index 100% rename from tests/tailor-images/azurelinux-direct-streaming-testimage/image.yaml rename to tests/images/azurelinux-direct-streaming-testimage/image.yaml diff --git a/tests/tailor-images/azurelinux-direct-streaming-testimage/tailor/baseimg.yaml b/tests/images/azurelinux-direct-streaming-testimage/tailor/baseimg.yaml similarity index 100% rename from tests/tailor-images/azurelinux-direct-streaming-testimage/tailor/baseimg.yaml rename to tests/images/azurelinux-direct-streaming-testimage/tailor/baseimg.yaml diff --git a/tests/tailor-images/common/files/config-placeholder.yaml b/tests/images/common/files/config-placeholder.yaml similarity index 100% rename from tests/tailor-images/common/files/config-placeholder.yaml rename to tests/images/common/files/config-placeholder.yaml diff --git a/tests/tailor-images/common/files/containerd-mmap-fix.cil b/tests/images/common/files/containerd-mmap-fix.cil similarity index 100% rename from tests/tailor-images/common/files/containerd-mmap-fix.cil rename to tests/images/common/files/containerd-mmap-fix.cil diff --git a/tests/tailor-images/common/files/getty@.service b/tests/images/common/files/getty@.service similarity index 100% rename from tests/tailor-images/common/files/getty@.service rename to tests/images/common/files/getty@.service diff --git a/tests/tailor-images/common/files/override-placeholder.conf b/tests/images/common/files/override-placeholder.conf similarity index 100% rename from tests/tailor-images/common/files/override-placeholder.conf rename to tests/images/common/files/override-placeholder.conf diff --git a/tests/tailor-images/common/files/serial-getty@.service b/tests/images/common/files/serial-getty@.service similarity index 100% rename from tests/tailor-images/common/files/serial-getty@.service rename to tests/images/common/files/serial-getty@.service diff --git a/tests/tailor-images/common/files/sudoers-wheel b/tests/images/common/files/sudoers-wheel similarity index 100% rename from tests/tailor-images/common/files/sudoers-wheel rename to tests/images/common/files/sudoers-wheel diff --git a/tests/tailor-images/common/files/trident-container.service b/tests/images/common/files/trident-container.service similarity index 100% rename from tests/tailor-images/common/files/trident-container.service rename to tests/images/common/files/trident-container.service diff --git a/tests/tailor-images/common/files/use-grpc-client-commit.conf b/tests/images/common/files/use-grpc-client-commit.conf similarity index 100% rename from tests/tailor-images/common/files/use-grpc-client-commit.conf rename to tests/images/common/files/use-grpc-client-commit.conf diff --git a/tests/tailor-images/common/matrix/base-core-arm64.yaml b/tests/images/common/matrix/base-core-arm64.yaml similarity index 100% rename from tests/tailor-images/common/matrix/base-core-arm64.yaml rename to tests/images/common/matrix/base-core-arm64.yaml diff --git a/tests/tailor-images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2204.yaml b/tests/images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2204.yaml similarity index 100% rename from tests/tailor-images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2204.yaml rename to tests/images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2204.yaml diff --git a/tests/tailor-images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2404.yaml b/tests/images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2404.yaml similarity index 100% rename from tests/tailor-images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2404.yaml rename to tests/images/foreign-direct-streaming-testimage/by-arch+source/arm64+ubuntu-2404.yaml diff --git a/tests/tailor-images/foreign-direct-streaming-testimage/by-source/gb200-2404.yaml b/tests/images/foreign-direct-streaming-testimage/by-source/gb200-2404.yaml similarity index 100% rename from tests/tailor-images/foreign-direct-streaming-testimage/by-source/gb200-2404.yaml rename to tests/images/foreign-direct-streaming-testimage/by-source/gb200-2404.yaml diff --git a/tests/tailor-images/foreign-direct-streaming-testimage/by-source/ubuntu-2404.yaml b/tests/images/foreign-direct-streaming-testimage/by-source/ubuntu-2404.yaml similarity index 100% rename from tests/tailor-images/foreign-direct-streaming-testimage/by-source/ubuntu-2404.yaml rename to tests/images/foreign-direct-streaming-testimage/by-source/ubuntu-2404.yaml diff --git a/tests/tailor-images/foreign-direct-streaming-testimage/image.yaml b/tests/images/foreign-direct-streaming-testimage/image.yaml similarity index 100% rename from tests/tailor-images/foreign-direct-streaming-testimage/image.yaml rename to tests/images/foreign-direct-streaming-testimage/image.yaml diff --git a/tests/tailor-images/tailor.yaml b/tests/images/tailor.yaml similarity index 100% rename from tests/tailor-images/tailor.yaml rename to tests/images/tailor.yaml diff --git a/tests/tailor-images/targets.mk b/tests/images/targets.mk similarity index 100% rename from tests/tailor-images/targets.mk rename to tests/images/targets.mk diff --git a/tests/tailor-images/trident-container-installer/README.md b/tests/images/trident-container-installer/README.md similarity index 88% rename from tests/tailor-images/trident-container-installer/README.md rename to tests/images/trident-container-installer/README.md index ab32274c66..81803800c9 100644 --- a/tests/tailor-images/trident-container-installer/README.md +++ b/tests/images/trident-container-installer/README.md @@ -13,7 +13,7 @@ container at boot. From the repo root, run: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-container-installer --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-container-installer --output-dir ./artifacts ``` Output is written to `artifacts/trident-container-installer_amd64_iso.iso` by default diff --git a/tests/tailor-images/trident-container-installer/base/files/root.profile b/tests/images/trident-container-installer/base/files/root.profile similarity index 100% rename from tests/tailor-images/trident-container-installer/base/files/root.profile rename to tests/images/trident-container-installer/base/files/root.profile diff --git a/tests/tailor-images/trident-container-installer/base/files/trident-container.service b/tests/images/trident-container-installer/base/files/trident-container.service similarity index 100% rename from tests/tailor-images/trident-container-installer/base/files/trident-container.service rename to tests/images/trident-container-installer/base/files/trident-container.service diff --git a/tests/tailor-images/trident-container-installer/base/scripts/load-containerd-selinux-fix.sh b/tests/images/trident-container-installer/base/scripts/load-containerd-selinux-fix.sh similarity index 100% rename from tests/tailor-images/trident-container-installer/base/scripts/load-containerd-selinux-fix.sh rename to tests/images/trident-container-installer/base/scripts/load-containerd-selinux-fix.sh diff --git a/tests/tailor-images/trident-container-installer/base/scripts/post-install.sh b/tests/images/trident-container-installer/base/scripts/post-install.sh similarity index 100% rename from tests/tailor-images/trident-container-installer/base/scripts/post-install.sh rename to tests/images/trident-container-installer/base/scripts/post-install.sh diff --git a/tests/tailor-images/trident-container-installer/image.yaml b/tests/images/trident-container-installer/image.yaml similarity index 100% rename from tests/tailor-images/trident-container-installer/image.yaml rename to tests/images/trident-container-installer/image.yaml diff --git a/tests/tailor-images/trident-container-installer/tailor/baseimg.yaml b/tests/images/trident-container-installer/tailor/baseimg.yaml similarity index 100% rename from tests/tailor-images/trident-container-installer/tailor/baseimg.yaml rename to tests/images/trident-container-installer/tailor/baseimg.yaml diff --git a/tests/tailor-images/trident-container-testimage/README.md b/tests/images/trident-container-testimage/README.md similarity index 86% rename from tests/tailor-images/trident-container-testimage/README.md rename to tests/images/trident-container-testimage/README.md index 619c7da2ee..1bde78fd7d 100644 --- a/tests/tailor-images/trident-container-testimage/README.md +++ b/tests/images/trident-container-testimage/README.md @@ -12,7 +12,7 @@ loaded at runtime. From the repo root, run: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-container-testimage --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-container-testimage --output-dir ./artifacts ``` Output is written to `artifacts/trident-container-testimage_amd64_cosi.cosi` by default diff --git a/tests/tailor-images/trident-container-testimage/base/files/trident-container.service b/tests/images/trident-container-testimage/base/files/trident-container.service similarity index 100% rename from tests/tailor-images/trident-container-testimage/base/files/trident-container.service rename to tests/images/trident-container-testimage/base/files/trident-container.service diff --git a/tests/tailor-images/trident-container-testimage/base/scripts/load-containerd-selinux-fix.sh b/tests/images/trident-container-testimage/base/scripts/load-containerd-selinux-fix.sh similarity index 100% rename from tests/tailor-images/trident-container-testimage/base/scripts/load-containerd-selinux-fix.sh rename to tests/images/trident-container-testimage/base/scripts/load-containerd-selinux-fix.sh diff --git a/tests/tailor-images/trident-container-testimage/base/scripts/post-install.sh b/tests/images/trident-container-testimage/base/scripts/post-install.sh similarity index 100% rename from tests/tailor-images/trident-container-testimage/base/scripts/post-install.sh rename to tests/images/trident-container-testimage/base/scripts/post-install.sh diff --git a/tests/tailor-images/trident-container-testimage/image.yaml b/tests/images/trident-container-testimage/image.yaml similarity index 100% rename from tests/tailor-images/trident-container-testimage/image.yaml rename to tests/images/trident-container-testimage/image.yaml diff --git a/tests/tailor-images/trident-container-testimage/tailor/baseimg.yaml b/tests/images/trident-container-testimage/tailor/baseimg.yaml similarity index 100% rename from tests/tailor-images/trident-container-testimage/tailor/baseimg.yaml rename to tests/images/trident-container-testimage/tailor/baseimg.yaml diff --git a/tests/tailor-images/trident-functest/image.yaml b/tests/images/trident-functest/image.yaml similarity index 100% rename from tests/tailor-images/trident-functest/image.yaml rename to tests/images/trident-functest/image.yaml diff --git a/tests/tailor-images/trident-functest/tailor/baseimg.yaml b/tests/images/trident-functest/tailor/baseimg.yaml similarity index 100% rename from tests/tailor-images/trident-functest/tailor/baseimg.yaml rename to tests/images/trident-functest/tailor/baseimg.yaml diff --git a/tests/tailor-images/trident-installer/README.md b/tests/images/trident-installer/README.md similarity index 85% rename from tests/tailor-images/trident-installer/README.md rename to tests/images/trident-installer/README.md index cf24a33a60..7226026ce5 100644 --- a/tests/tailor-images/trident-installer/README.md +++ b/tests/images/trident-installer/README.md @@ -8,7 +8,7 @@ startup and reads a configuration that can be patched into the ISO. From the repo root, run: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-installer -s arch=amd64 -s variant=default --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-installer -s arch=amd64 -s variant=default --output-dir ./artifacts ``` Other legacy variants map to selectors on the same family: diff --git a/tests/tailor-images/trident-installer/base/files/direct-streaming-placeholder.conf b/tests/images/trident-installer/base/files/direct-streaming-placeholder.conf similarity index 100% rename from tests/tailor-images/trident-installer/base/files/direct-streaming-placeholder.conf rename to tests/images/trident-installer/base/files/direct-streaming-placeholder.conf diff --git a/tests/tailor-images/trident-installer/base/files/pre-trident-script.sh b/tests/images/trident-installer/base/files/pre-trident-script.sh similarity index 100% rename from tests/tailor-images/trident-installer/base/files/pre-trident-script.sh rename to tests/images/trident-installer/base/files/pre-trident-script.sh diff --git a/tests/tailor-images/trident-installer/base/files/rcp-agent.yaml b/tests/images/trident-installer/base/files/rcp-agent.yaml similarity index 100% rename from tests/tailor-images/trident-installer/base/files/rcp-agent.yaml rename to tests/images/trident-installer/base/files/rcp-agent.yaml diff --git a/tests/tailor-images/trident-installer/base/files/root.profile b/tests/images/trident-installer/base/files/root.profile similarity index 100% rename from tests/tailor-images/trident-installer/base/files/root.profile rename to tests/images/trident-installer/base/files/root.profile diff --git a/tests/tailor-images/trident-installer/base/files/trident-install.service b/tests/images/trident-installer/base/files/trident-install.service similarity index 100% rename from tests/tailor-images/trident-installer/base/files/trident-install.service rename to tests/images/trident-installer/base/files/trident-install.service diff --git a/tests/tailor-images/trident-installer/base/files/trident-split-install.service b/tests/images/trident-installer/base/files/trident-split-install.service similarity index 100% rename from tests/tailor-images/trident-installer/base/files/trident-split-install.service rename to tests/images/trident-installer/base/files/trident-split-install.service diff --git a/tests/tailor-images/trident-installer/base/post-install.sh b/tests/images/trident-installer/base/post-install.sh similarity index 100% rename from tests/tailor-images/trident-installer/base/post-install.sh rename to tests/images/trident-installer/base/post-install.sh diff --git a/tests/tailor-images/trident-installer/by-arch/arm64.yaml b/tests/images/trident-installer/by-arch/arm64.yaml similarity index 100% rename from tests/tailor-images/trident-installer/by-arch/arm64.yaml rename to tests/images/trident-installer/by-arch/arm64.yaml diff --git a/tests/tailor-images/trident-installer/by-variant/direct-streaming.yaml b/tests/images/trident-installer/by-variant/direct-streaming.yaml similarity index 100% rename from tests/tailor-images/trident-installer/by-variant/direct-streaming.yaml rename to tests/images/trident-installer/by-variant/direct-streaming.yaml diff --git a/tests/tailor-images/trident-installer/by-variant/split.yaml b/tests/images/trident-installer/by-variant/split.yaml similarity index 100% rename from tests/tailor-images/trident-installer/by-variant/split.yaml rename to tests/images/trident-installer/by-variant/split.yaml diff --git a/tests/tailor-images/trident-installer/image.yaml b/tests/images/trident-installer/image.yaml similarity index 100% rename from tests/tailor-images/trident-installer/image.yaml rename to tests/images/trident-installer/image.yaml diff --git a/tests/tailor-images/trident-installer/include/common-files.yaml b/tests/images/trident-installer/include/common-files.yaml similarity index 100% rename from tests/tailor-images/trident-installer/include/common-files.yaml rename to tests/images/trident-installer/include/common-files.yaml diff --git a/tests/tailor-images/trident-installer/include/common-packages.yaml b/tests/images/trident-installer/include/common-packages.yaml similarity index 100% rename from tests/tailor-images/trident-installer/include/common-packages.yaml rename to tests/images/trident-installer/include/common-packages.yaml diff --git a/tests/tailor-images/trident-installer/include/kernel-args.yaml b/tests/images/trident-installer/include/kernel-args.yaml similarity index 100% rename from tests/tailor-images/trident-installer/include/kernel-args.yaml rename to tests/images/trident-installer/include/kernel-args.yaml diff --git a/tests/tailor-images/trident-installer/include/storage.yaml b/tests/images/trident-installer/include/storage.yaml similarity index 100% rename from tests/tailor-images/trident-installer/include/storage.yaml rename to tests/images/trident-installer/include/storage.yaml diff --git a/tests/tailor-images/trident-mos/files/pre-trident-script.sh b/tests/images/trident-mos/files/pre-trident-script.sh similarity index 100% rename from tests/tailor-images/trident-mos/files/pre-trident-script.sh rename to tests/images/trident-mos/files/pre-trident-script.sh diff --git a/tests/tailor-images/trident-mos/files/rcp-agent.service b/tests/images/trident-mos/files/rcp-agent.service similarity index 100% rename from tests/tailor-images/trident-mos/files/rcp-agent.service rename to tests/images/trident-mos/files/rcp-agent.service diff --git a/tests/tailor-images/trident-mos/files/rcp-agent.yaml b/tests/images/trident-mos/files/rcp-agent.yaml similarity index 100% rename from tests/tailor-images/trident-mos/files/rcp-agent.yaml rename to tests/images/trident-mos/files/rcp-agent.yaml diff --git a/tests/tailor-images/trident-mos/files/root.profile b/tests/images/trident-mos/files/root.profile similarity index 100% rename from tests/tailor-images/trident-mos/files/root.profile rename to tests/images/trident-mos/files/root.profile diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/350-action-efi-application.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/350-action-efi-application.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/350-action-efi-application.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/350-action-efi-application.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/300-0x00000000.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/300-0x00000000.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/300-0x00000000.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/300-0x00000000.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/600-0xffffffff.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/600-0xffffffff.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/600-0xffffffff.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/500-separator.pcrlock.d/600-0xffffffff.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/750-enter-initrd.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/750-enter-initrd.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/750-enter-initrd.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/750-enter-initrd.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/800-leave-initrd.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/800-leave-initrd.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/800-leave-initrd.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/800-leave-initrd.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/850-sysinit.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/850-sysinit.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/850-sysinit.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/850-sysinit.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/900-ready.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/900-ready.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/900-ready.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/900-ready.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/950-shutdown.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/950-shutdown.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/950-shutdown.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/950-shutdown.pcrlock diff --git a/tests/tailor-images/trident-mos/files/static-pcrlock-files/990-final.pcrlock b/tests/images/trident-mos/files/static-pcrlock-files/990-final.pcrlock similarity index 100% rename from tests/tailor-images/trident-mos/files/static-pcrlock-files/990-final.pcrlock rename to tests/images/trident-mos/files/static-pcrlock-files/990-final.pcrlock diff --git a/tests/tailor-images/trident-mos/files/trident-install.service b/tests/images/trident-mos/files/trident-install.service similarity index 100% rename from tests/tailor-images/trident-mos/files/trident-install.service rename to tests/images/trident-mos/files/trident-install.service diff --git a/tests/tailor-images/trident-mos/files/trident.fc b/tests/images/trident-mos/files/trident.fc similarity index 100% rename from tests/tailor-images/trident-mos/files/trident.fc rename to tests/images/trident-mos/files/trident.fc diff --git a/tests/tailor-images/trident-mos/files/trident.if b/tests/images/trident-mos/files/trident.if similarity index 100% rename from tests/tailor-images/trident-mos/files/trident.if rename to tests/images/trident-mos/files/trident.if diff --git a/tests/tailor-images/trident-mos/files/trident.te b/tests/images/trident-mos/files/trident.te similarity index 100% rename from tests/tailor-images/trident-mos/files/trident.te rename to tests/images/trident-mos/files/trident.te diff --git a/tests/tailor-images/trident-mos/files/tridentd.service b/tests/images/trident-mos/files/tridentd.service similarity index 100% rename from tests/tailor-images/trident-mos/files/tridentd.service rename to tests/images/trident-mos/files/tridentd.service diff --git a/tests/tailor-images/trident-mos/files/tridentd.socket b/tests/images/trident-mos/files/tridentd.socket similarity index 100% rename from tests/tailor-images/trident-mos/files/tridentd.socket rename to tests/images/trident-mos/files/tridentd.socket diff --git a/tests/tailor-images/trident-mos/image.yaml b/tests/images/trident-mos/image.yaml similarity index 100% rename from tests/tailor-images/trident-mos/image.yaml rename to tests/images/trident-mos/image.yaml diff --git a/tests/tailor-images/trident-mos/iso.yaml b/tests/images/trident-mos/iso.yaml similarity index 100% rename from tests/tailor-images/trident-mos/iso.yaml rename to tests/images/trident-mos/iso.yaml diff --git a/tests/tailor-images/trident-mos/post-install.sh b/tests/images/trident-mos/post-install.sh similarity index 100% rename from tests/tailor-images/trident-mos/post-install.sh rename to tests/images/trident-mos/post-install.sh diff --git a/tests/tailor-images/trident-testimage/README.md b/tests/images/trident-testimage/README.md similarity index 89% rename from tests/tailor-images/trident-testimage/README.md rename to tests/images/trident-testimage/README.md index cb27652f49..422011aa0b 100644 --- a/tests/tailor-images/trident-testimage/README.md +++ b/tests/images/trident-testimage/README.md @@ -17,7 +17,7 @@ It also includes openssh-server to allow for remote access. From the repo root, run: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-testimage -s arch=amd64 --output-dir ./artifacts ``` Use `-s arch=arm64` for the ARM64 variant. diff --git a/tests/tailor-images/trident-testimage/base/post-install.sh b/tests/images/trident-testimage/base/post-install.sh similarity index 100% rename from tests/tailor-images/trident-testimage/base/post-install.sh rename to tests/images/trident-testimage/base/post-install.sh diff --git a/tests/tailor-images/trident-testimage/by-arch/arm64.yaml b/tests/images/trident-testimage/by-arch/arm64.yaml similarity index 100% rename from tests/tailor-images/trident-testimage/by-arch/arm64.yaml rename to tests/images/trident-testimage/by-arch/arm64.yaml diff --git a/tests/tailor-images/trident-testimage/image.yaml b/tests/images/trident-testimage/image.yaml similarity index 100% rename from tests/tailor-images/trident-testimage/image.yaml rename to tests/images/trident-testimage/image.yaml diff --git a/tests/tailor-images/trident-testimage/tailor/baseimg.yaml b/tests/images/trident-testimage/tailor/baseimg.yaml similarity index 100% rename from tests/tailor-images/trident-testimage/tailor/baseimg.yaml rename to tests/images/trident-testimage/tailor/baseimg.yaml diff --git a/tests/tailor-images/trident-verity-testimage/README.md b/tests/images/trident-verity-testimage/README.md similarity index 89% rename from tests/tailor-images/trident-verity-testimage/README.md rename to tests/images/trident-verity-testimage/README.md index 5604cf1778..bd1b636aa2 100644 --- a/tests/tailor-images/trident-verity-testimage/README.md +++ b/tests/images/trident-verity-testimage/README.md @@ -18,7 +18,7 @@ dm-verity. From the repo root, run: ```bash -cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/tailor-images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=root --output-dir ./artifacts +cargo run --manifest-path tools/tailor/Cargo.toml -- --manifest tests/images/tailor.yaml build trident-verity-testimage -s deployment=host -s mode=root --output-dir ./artifacts ``` Other legacy variants map to selectors on the same family: diff --git a/tests/tailor-images/trident-verity-testimage/base/create-web-dir.sh b/tests/images/trident-verity-testimage/base/create-web-dir.sh similarity index 100% rename from tests/tailor-images/trident-verity-testimage/base/create-web-dir.sh rename to tests/images/trident-verity-testimage/base/create-web-dir.sh diff --git a/tests/tailor-images/trident-verity-testimage/base/etc-mount.service b/tests/images/trident-verity-testimage/base/etc-mount.service similarity index 100% rename from tests/tailor-images/trident-verity-testimage/base/etc-mount.service rename to tests/images/trident-verity-testimage/base/etc-mount.service diff --git a/tests/tailor-images/trident-verity-testimage/base/etc-mount.sh b/tests/images/trident-verity-testimage/base/etc-mount.sh similarity index 100% rename from tests/tailor-images/trident-verity-testimage/base/etc-mount.sh rename to tests/images/trident-verity-testimage/base/etc-mount.sh diff --git a/tests/tailor-images/trident-verity-testimage/base/trident-debug-log.sh b/tests/images/trident-verity-testimage/base/trident-debug-log.sh similarity index 100% rename from tests/tailor-images/trident-verity-testimage/base/trident-debug-log.sh rename to tests/images/trident-verity-testimage/base/trident-debug-log.sh diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment+mode/container+root.yaml b/tests/images/trident-verity-testimage/by-deployment+mode/container+root.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment+mode/container+root.yaml rename to tests/images/trident-verity-testimage/by-deployment+mode/container+root.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment+mode/container+usr.yaml b/tests/images/trident-verity-testimage/by-deployment+mode/container+usr.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment+mode/container+usr.yaml rename to tests/images/trident-verity-testimage/by-deployment+mode/container+usr.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment+mode/host+root.yaml b/tests/images/trident-verity-testimage/by-deployment+mode/host+root.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment+mode/host+root.yaml rename to tests/images/trident-verity-testimage/by-deployment+mode/host+root.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment+mode/host+usr.yaml b/tests/images/trident-verity-testimage/by-deployment+mode/host+usr.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment+mode/host+usr.yaml rename to tests/images/trident-verity-testimage/by-deployment+mode/host+usr.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment/container.yaml b/tests/images/trident-verity-testimage/by-deployment/container.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment/container.yaml rename to tests/images/trident-verity-testimage/by-deployment/container.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-deployment/host.yaml b/tests/images/trident-verity-testimage/by-deployment/host.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-deployment/host.yaml rename to tests/images/trident-verity-testimage/by-deployment/host.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-mode/root.yaml b/tests/images/trident-verity-testimage/by-mode/root.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-mode/root.yaml rename to tests/images/trident-verity-testimage/by-mode/root.yaml diff --git a/tests/tailor-images/trident-verity-testimage/by-mode/usr.yaml b/tests/images/trident-verity-testimage/by-mode/usr.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/by-mode/usr.yaml rename to tests/images/trident-verity-testimage/by-mode/usr.yaml diff --git a/tests/tailor-images/trident-verity-testimage/image.yaml b/tests/images/trident-verity-testimage/image.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/image.yaml rename to tests/images/trident-verity-testimage/image.yaml diff --git a/tests/tailor-images/trident-verity-testimage/include/root-os-common.yaml b/tests/images/trident-verity-testimage/include/root-os-common.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/include/root-os-common.yaml rename to tests/images/trident-verity-testimage/include/root-os-common.yaml diff --git a/tests/tailor-images/trident-verity-testimage/include/root-storage.yaml b/tests/images/trident-verity-testimage/include/root-storage.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/include/root-storage.yaml rename to tests/images/trident-verity-testimage/include/root-storage.yaml diff --git a/tests/tailor-images/trident-verity-testimage/include/usr-os-common.yaml b/tests/images/trident-verity-testimage/include/usr-os-common.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/include/usr-os-common.yaml rename to tests/images/trident-verity-testimage/include/usr-os-common.yaml diff --git a/tests/tailor-images/trident-verity-testimage/include/usr-storage.yaml b/tests/images/trident-verity-testimage/include/usr-storage.yaml similarity index 100% rename from tests/tailor-images/trident-verity-testimage/include/usr-storage.yaml rename to tests/images/trident-verity-testimage/include/usr-storage.yaml diff --git a/tests/tailor-images/trident-verity-testimage/usr/files/dracut-nohostonly.conf b/tests/images/trident-verity-testimage/usr/files/dracut-nohostonly.conf similarity index 100% rename from tests/tailor-images/trident-verity-testimage/usr/files/dracut-nohostonly.conf rename to tests/images/trident-verity-testimage/usr/files/dracut-nohostonly.conf diff --git a/tests/tailor-images/trident-vm-testimage/README.md b/tests/images/trident-vm-testimage/README.md similarity index 100% rename from tests/tailor-images/trident-vm-testimage/README.md rename to tests/images/trident-vm-testimage/README.md diff --git a/tests/tailor-images/trident-vm-testimage/base/.gitignore b/tests/images/trident-vm-testimage/base/.gitignore similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/.gitignore rename to tests/images/trident-vm-testimage/base/.gitignore diff --git a/tests/tailor-images/trident-vm-testimage/base/files/.gitignore b/tests/images/trident-vm-testimage/base/files/.gitignore similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/.gitignore rename to tests/images/trident-vm-testimage/base/files/.gitignore diff --git a/tests/tailor-images/trident-vm-testimage/base/files/99-dhcp-eth0.network b/tests/images/trident-vm-testimage/base/files/99-dhcp-eth0.network similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/99-dhcp-eth0.network rename to tests/images/trident-vm-testimage/base/files/99-dhcp-eth0.network diff --git a/tests/tailor-images/trident-vm-testimage/base/files/etc-mount-mic.service b/tests/images/trident-vm-testimage/base/files/etc-mount-mic.service similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/etc-mount-mic.service rename to tests/images/trident-vm-testimage/base/files/etc-mount-mic.service diff --git a/tests/tailor-images/trident-vm-testimage/base/files/etc-mount.service b/tests/images/trident-vm-testimage/base/files/etc-mount.service similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/etc-mount.service rename to tests/images/trident-vm-testimage/base/files/etc-mount.service diff --git a/tests/tailor-images/trident-vm-testimage/base/files/etc-mount.sh b/tests/images/trident-vm-testimage/base/files/etc-mount.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/etc-mount.sh rename to tests/images/trident-vm-testimage/base/files/etc-mount.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/files/sshd-keygen.service b/tests/images/trident-vm-testimage/base/files/sshd-keygen.service similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/sshd-keygen.service rename to tests/images/trident-vm-testimage/base/files/sshd-keygen.service diff --git a/tests/tailor-images/trident-vm-testimage/base/files/trident-acl-agent-cert-install.service b/tests/images/trident-vm-testimage/base/files/trident-acl-agent-cert-install.service similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/trident-acl-agent-cert-install.service rename to tests/images/trident-vm-testimage/base/files/trident-acl-agent-cert-install.service diff --git a/tests/tailor-images/trident-vm-testimage/base/files/trident-acl-agent-override.conf b/tests/images/trident-vm-testimage/base/files/trident-acl-agent-override.conf similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/files/trident-acl-agent-override.conf rename to tests/images/trident-vm-testimage/base/files/trident-acl-agent-override.conf diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/create-rw-overlay-dirs.sh b/tests/images/trident-vm-testimage/base/scripts/create-rw-overlay-dirs.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/create-rw-overlay-dirs.sh rename to tests/images/trident-vm-testimage/base/scripts/create-rw-overlay-dirs.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/create-ssh-dirs.sh b/tests/images/trident-vm-testimage/base/scripts/create-ssh-dirs.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/create-ssh-dirs.sh rename to tests/images/trident-vm-testimage/base/scripts/create-ssh-dirs.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/duid-type-to-link-layer.sh b/tests/images/trident-vm-testimage/base/scripts/duid-type-to-link-layer.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/duid-type-to-link-layer.sh rename to tests/images/trident-vm-testimage/base/scripts/duid-type-to-link-layer.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/lsblk.sh b/tests/images/trident-vm-testimage/base/scripts/lsblk.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/lsblk.sh rename to tests/images/trident-vm-testimage/base/scripts/lsblk.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/post-install.sh b/tests/images/trident-vm-testimage/base/scripts/post-install.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/post-install.sh rename to tests/images/trident-vm-testimage/base/scripts/post-install.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config-usrverity.sh b/tests/images/trident-vm-testimage/base/scripts/prepare-update-config-usrverity.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config-usrverity.sh rename to tests/images/trident-vm-testimage/base/scripts/prepare-update-config-usrverity.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config-verity.sh b/tests/images/trident-vm-testimage/base/scripts/prepare-update-config-verity.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config-verity.sh rename to tests/images/trident-vm-testimage/base/scripts/prepare-update-config-verity.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config.sh b/tests/images/trident-vm-testimage/base/scripts/prepare-update-config.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/prepare-update-config.sh rename to tests/images/trident-vm-testimage/base/scripts/prepare-update-config.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/ssh-move-host-keys.sh b/tests/images/trident-vm-testimage/base/scripts/ssh-move-host-keys.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/ssh-move-host-keys.sh rename to tests/images/trident-vm-testimage/base/scripts/ssh-move-host-keys.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/update-host-status.sh b/tests/images/trident-vm-testimage/base/scripts/update-host-status.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/update-host-status.sh rename to tests/images/trident-vm-testimage/base/scripts/update-host-status.sh diff --git a/tests/tailor-images/trident-vm-testimage/base/scripts/update-os-release.sh b/tests/images/trident-vm-testimage/base/scripts/update-os-release.sh similarity index 100% rename from tests/tailor-images/trident-vm-testimage/base/scripts/update-os-release.sh rename to tests/images/trident-vm-testimage/base/scripts/update-os-release.sh diff --git a/tests/tailor-images/trident-vm-testimage/by-arch+scenario/arm64+grub-verity.yaml b/tests/images/trident-vm-testimage/by-arch+scenario/arm64+grub-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-arch+scenario/arm64+grub-verity.yaml rename to tests/images/trident-vm-testimage/by-arch+scenario/arm64+grub-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-arch/arm64.yaml b/tests/images/trident-vm-testimage/by-arch/arm64.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-arch/arm64.yaml rename to tests/images/trident-vm-testimage/by-arch/arm64.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/acl-agent-base.yaml b/tests/images/trident-vm-testimage/by-scenario/acl-agent-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/acl-agent-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/acl-agent-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/acl-agent.yaml b/tests/images/trident-vm-testimage/by-scenario/acl-agent.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/acl-agent.yaml rename to tests/images/trident-vm-testimage/by-scenario/acl-agent.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-base.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity+grub-verity-azure.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity+grub-verity-azure.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity+grub-verity-azure.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity+grub-verity-azure.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-azure-base.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity-azure-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-azure-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity-azure-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-azure.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity-azure.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-azure.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity-azure.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-base+grub-verity-azure-base.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity-base+grub-verity-azure-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-base+grub-verity-azure-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity-base+grub-verity-azure-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-base.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity.yaml b/tests/images/trident-vm-testimage/by-scenario/grub-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub-verity.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/grub.yaml b/tests/images/trident-vm-testimage/by-scenario/grub.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/grub.yaml rename to tests/images/trident-vm-testimage/by-scenario/grub.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/root-verity+usr-verity+acl-agent+acl-agent-base.yaml b/tests/images/trident-vm-testimage/by-scenario/root-verity+usr-verity+acl-agent+acl-agent-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/root-verity+usr-verity+acl-agent+acl-agent-base.yaml rename to tests/images/trident-vm-testimage/by-scenario/root-verity+usr-verity+acl-agent+acl-agent-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/root-verity.yaml b/tests/images/trident-vm-testimage/by-scenario/root-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/root-verity.yaml rename to tests/images/trident-vm-testimage/by-scenario/root-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/by-scenario/usr-verity.yaml b/tests/images/trident-vm-testimage/by-scenario/usr-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/by-scenario/usr-verity.yaml rename to tests/images/trident-vm-testimage/by-scenario/usr-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/image.yaml b/tests/images/trident-vm-testimage/image.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/image.yaml rename to tests/images/trident-vm-testimage/image.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-base-scripts.yaml b/tests/images/trident-vm-testimage/include/grub-base-scripts.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-base-scripts.yaml rename to tests/images/trident-vm-testimage/include/grub-base-scripts.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-scripts.yaml b/tests/images/trident-vm-testimage/include/grub-scripts.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-scripts.yaml rename to tests/images/trident-vm-testimage/include/grub-scripts.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-verity-base-os-common.yaml b/tests/images/trident-vm-testimage/include/grub-verity-base-os-common.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-verity-base-os-common.yaml rename to tests/images/trident-vm-testimage/include/grub-verity-base-os-common.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-verity-base-scripts.yaml b/tests/images/trident-vm-testimage/include/grub-verity-base-scripts.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-verity-base-scripts.yaml rename to tests/images/trident-vm-testimage/include/grub-verity-base-scripts.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-verity-os-common.yaml b/tests/images/trident-vm-testimage/include/grub-verity-os-common.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-verity-os-common.yaml rename to tests/images/trident-vm-testimage/include/grub-verity-os-common.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/grub-verity-scripts.yaml b/tests/images/trident-vm-testimage/include/grub-verity-scripts.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/grub-verity-scripts.yaml rename to tests/images/trident-vm-testimage/include/grub-verity-scripts.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-acl-agent.yaml b/tests/images/trident-vm-testimage/include/storage-acl-agent.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-acl-agent.yaml rename to tests/images/trident-vm-testimage/include/storage-acl-agent.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub-update.yaml b/tests/images/trident-vm-testimage/include/storage-grub-update.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub-update.yaml rename to tests/images/trident-vm-testimage/include/storage-grub-update.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-azure-base.yaml b/tests/images/trident-vm-testimage/include/storage-grub-verity-azure-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-azure-base.yaml rename to tests/images/trident-vm-testimage/include/storage-grub-verity-azure-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-azure.yaml b/tests/images/trident-vm-testimage/include/storage-grub-verity-azure.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-azure.yaml rename to tests/images/trident-vm-testimage/include/storage-grub-verity-azure.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-base.yaml b/tests/images/trident-vm-testimage/include/storage-grub-verity-base.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub-verity-base.yaml rename to tests/images/trident-vm-testimage/include/storage-grub-verity-base.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub-verity.yaml b/tests/images/trident-vm-testimage/include/storage-grub-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub-verity.yaml rename to tests/images/trident-vm-testimage/include/storage-grub-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-grub.yaml b/tests/images/trident-vm-testimage/include/storage-grub.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-grub.yaml rename to tests/images/trident-vm-testimage/include/storage-grub.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-root-verity.yaml b/tests/images/trident-vm-testimage/include/storage-root-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-root-verity.yaml rename to tests/images/trident-vm-testimage/include/storage-root-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/storage-usr-verity.yaml b/tests/images/trident-vm-testimage/include/storage-usr-verity.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/storage-usr-verity.yaml rename to tests/images/trident-vm-testimage/include/storage-usr-verity.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/uki-verity-os-common.yaml b/tests/images/trident-vm-testimage/include/uki-verity-os-common.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/uki-verity-os-common.yaml rename to tests/images/trident-vm-testimage/include/uki-verity-os-common.yaml diff --git a/tests/tailor-images/trident-vm-testimage/include/uki-verity-scripts.yaml b/tests/images/trident-vm-testimage/include/uki-verity-scripts.yaml similarity index 100% rename from tests/tailor-images/trident-vm-testimage/include/uki-verity-scripts.yaml rename to tests/images/trident-vm-testimage/include/uki-verity-scripts.yaml