test/run/assemblers: convert to a v2 manifest

Instead of using the F34-based manifests, let's switch to F38. I tried my
best to import the vars into the new manifest, but I don't think that's
currently supported.

Makefile

@@ -205,6 +205,7 @@ coverity-clean-all: coverity-clean
 
 TEST_MANIFESTS_MPP = $(filter-out $(SRCDIR)/test/data/manifests/fedora-build.mpp.yaml, \
              $(wildcard $(SRCDIR)/test/data/manifests/*.mpp.yaml)) \
+             $(wildcard $(SRCDIR)/test/data/assemblers/*.mpp.yaml) \
 		     $(wildcard $(SRCDIR)/test/data/stages/*/*.mpp.yaml)
 TEST_MANIFESTS_GEN = $(TEST_MANIFESTS_MPP:%.mpp.yaml=%.json)
 

test/data/assemblers/manifest.mpp.yaml

@@ -0,0 +1,107 @@
+# This must be a v1 manifest!
+
+mpp-vars:
+  arch: x86_64
+  release: 38
+  releasever: f$release
+  module_platform_id: platform:$releasever
+  snapshot: '20230413'
+  updates: '20230724'
+  ref: fedora/$arch/osbuild
+  isolabel: Fedora-$release-X86_64
+  repos:
+    - id: default
+      baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/
+    - id: modular
+      baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/
+    - id: updates
+      baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/
+    - id: updates-modular
+      baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/
+  gpgkeys:
+    - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGIC2cYBEADJye1aE0AR17qwj6wsHWlCQlcihmqkL8s4gbOk1IevBbH4iXJx\nlu6bN+NhTcCCX6eHmaL5Pwb/bpkMmLR+/r1D2cLDK24YzvN6kJnwRQUTf2dbqYmg\nmNBgIMm+kAabBZPwUHUzyQ9CT/WJpYr1OYu8JIkdxF35nrPewnnOUUqxqbi8fXRQ\ngskSLF8UveiOjFIqmWwlPwT1UtnevAaF80UGQlkwFvqjjh4b9vKY2gHMAQwt+wg5\nHFFCSwSrnd88ZoDb3pKvDMeurYUiPzF5f2r+ziVkMuaSNckvp58uge7HvyqQPAdJ\nZRswCCxhUAo9VqkNfB4Ud25ASyalk9jOE3HB8E35gFfPXvuX1n15THXNcwMEiybk\nOmne2YwXL8ShGNr5otjqywThMrrqcl2g/pJVTcpDHTR5Hn9YRp+GHlYLjyEr+/x7\nxM19y9ca9GUiJqDbEREHcKKIhYiGmcIjjcJvei/3C/aM4pqeGFJBbVSnw3qeMxH/\n6ArAMA1sAdShCkv2YjlcF0r4uoCjXdS3xrKLz9PSCquot7RySnOE9TZ7flfJll7Z\nq+lNaSeJg7FK8VWSUb9Lit6VEYVbzWKzespDDbujrHbFpydyq8gXurk7bSR2w0te\ngsmytQqT/w1z2bydgGF6SfY9Px0wuA8GQKr48l5Bhdc6+vHHFqPKzz0PVQARAQAB\ntDFGZWRvcmEgKDM4KSA8ZmVkb3JhLTM4LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEalG7q7o9VGe2FxIhgJqNfOsQtGQFAmIC2cYCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQgJqNfOsQtGScyw/7BLmD4Fwi4QZY94zl\nvlJdNufZRavOemSIVVDHoCr8pQBAdrvoMypxJd5zM4ODIqFsjdYpFti+Tkeq4/4U\n25UoLPEOtU8UDt2uq7LqfdCxspaj7VyXAJIkpf7wEvLS4Jzo+YaMIlsd0dCrMXTM\nvhu4gKpBFW6C+gGlmuDyTJbyrf7ilytgVzVtIfRrT7XffylviIlZHwKm43UDjvzX\nYEl3EAFR1RjATwXMy2aJh7GCNsz+fKs+7YRKQUhpMF5un/2pyNJO+LbVGGwGZvga\nK9Kfsg/4r1ync4nDDD1dadKIHhobDeiJ9uZLoBvvVDz7Ywu7q/vv4zIPxstYBNq4\n6fLKDtYXuJCK0EV9Qy4ox67t0UGlaRGH8y5YUqOI10xH7iQej0xWlSc8w2dKhPz8\nz9XLv2OMK+PvqvflhFHhWkqEoQRqTu0TVD0fLLe4lqieJlqZcJqW0F9G/vNSSWmf\nPOLa/Nim71gL2fPjCJOIRV4K/cJSyBmu5NchG7dHD5sUtJxZ4TFSuepaBZ8cPK1x\ne26TaCBqoUWgUXWmw+P89aOpYOJYEFfT/VAm2Ywn+c1EFUmD+30wQ7aP/RUFl94z\nn0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB\nzquq5jBVAnsNIhs7g47GWKyDUJM=\n=aCLl\n-----END PGP PUBLIC KEY BLOCK-----\n"
+
+pipeline:
+  build:
+    runner:
+      mpp-format-string: org.osbuild.fedora{release}
+    pipeline:
+      stages:
+      - name: org.osbuild.rpm
+        options:
+          mpp-depsolve:
+            architecture: $arch
+            module-platform-id: $module_platform_id
+            repos:
+              mpp-eval: repos
+            packages:
+              - binutils
+              - btrfs-progs
+              - cryptsetup
+              - dnf
+              - dosfstools
+              - e2fsprogs
+              - gdisk
+              - grub2-pc
+              - policycoreutils
+              - python3-iniparse
+              - python3-toml
+              - python3-yaml
+              - qemu-img
+              - rpm-ostree
+              - systemd
+              - tar
+              - xfsprogs
+              - xz
+              - lvm2
+              - selinux-policy-targeted
+              - genisoimage
+              - isomd5sum
+              - xorriso
+              - syslinux
+              - skopeo
+              - lorax-templates-generic
+              - syslinux-nonlinux
+              - squashfs-tools
+              - grub2-pc-modules
+              - grub2-tools
+              - grub2-efi-x64
+              - shim-x64
+              - efibootmgr
+              - grub2-tools-minimal
+              - grub2-tools-extra
+              - grub2-tools-efi
+              - grub2-efi-x64
+              - grub2-efi-x64-cdboot
+              - shim-ia32
+              - grub2-efi-ia32-cdboot
+              - zstd
+              - openscap-utils
+          gpgkeys:
+            mpp-eval: gpgkeys
+          exclude:
+            docs: true
+      - name: org.osbuild.selinux
+        options:
+          file_contexts: etc/selinux/targeted/contexts/files/file_contexts
+          labels:
+            /usr/bin/cp: system_u:object_r:install_exec_t:s0
+            /usr/bin/tar: system_u:object_r:install_exec_t:s0
+  stages:
+    - name: org.osbuild.rpm
+      options:
+        mpp-depsolve:
+          architecture: $arch
+          module-platform-id: $module_platform_id
+          repos:
+            mpp-eval: repos
+          packages:
+            - filesystem
+            - selinux-policy-targeted
+        gpgkeys:
+          mpp-eval: gpgkeys
+        exclude:
+          docs: true
+    - name: org.osbuild.selinux
+      options:
+        file_contexts: etc/selinux/targeted/contexts/files/file_contexts

test/run/test_assemblers.py

@@ -102,7 +102,7 @@ def test_rawfs(osbuild, fs_type):
 def test_ostree(osbuild):
     with osbuild as osb:
         with open(os.path.join(test.TestBase.locate_test_data(),
-                  "manifests/fedora-ostree-commit.json"),
+                               "manifests/fedora-ostree-commit.json"),
                   encoding="utf8") as f:
             manifest = json.load(f)
 
@@ -294,7 +294,7 @@ def open_image(ctl, image, fmt):
 @contextlib.contextmanager
 def run_assembler(osb, name, options, output_path):
     with open(os.path.join(test.TestBase.locate_test_data(),
-              "manifests/filesystem.json"),
+                           "assemblers/manifest.json"),
               encoding="utf8") as f:
         manifest = json.load(f)
     manifest["pipeline"] = dict(
@@ -307,6 +307,6 @@ def run_assembler(osb, name, options, output_path):
     assert treeid
 
     with tempfile.TemporaryDirectory(dir="/var/tmp") as output_dir:
-        osb.compile(data, output_dir=output_dir, exports=["assembler", "tree"])
+        osb.compile(data, output_dir=output_dir, exports=["assembler", "tree"], checkpoints=["tree"])
         tree = os.path.join(output_dir, "tree")
         yield tree, os.path.join(output_dir, "assembler", output_path)

tools/check-snapshots

@@ -90,7 +90,8 @@ def check_baseurl(repo, snapshots):
     return invalid, newer
 
 
-def check_snapshot_urls(urls, snapshots, skip=["test/data/manifests", "test/data/stages"], errors_only=False):
+def check_snapshot_urls(urls, snapshots, skip=["test/data/assemblers", "test/data/manifests", "test/data/stages"],
+                        errors_only=False):
     """check the urls against the current list of snapshots
 
     Returns: