test: convert test_boot to runtime tests with F32

Move the `test_boot` suite into ./test/run closer to the other runtime
tests, and convert the used manifest over to an MPP based F32 manifest.

.github/workflows/runtime-tests.yml

@@ -22,17 +22,6 @@ jobs:
       with:
         run: make test-runtime
 
-  boot_tests:
-    name: "Boot Tests"
-    runs-on: ubuntu-latest
-    steps:
-    - name: "Clone Repository"
-      uses: actions/checkout@v2
-    - name: "Run Boot Tests"
-      uses: osbuild/containers/ghci/actions/ghci-osbuild@ghci/v1
-      with:
-        run: python3 -m unittest -v test.test_boot
-
   assembler_tests:
     name: "Assembler Tests"
     runs-on: ubuntu-latest

Makefile

@@ -126,6 +126,7 @@ $(TEST_MANIFESTS_GEN): $(SRCDIR)/test/data/manifests/%.json: $(SRCDIR)/test/data
 			"--cwd=$(SRCDIR)/test/data/manifests"
 
 $(SRCDIR)/test/data/manifests/f32-base.json: $(SRCDIR)/test/data/manifests/f32-build.json
+$(SRCDIR)/test/data/manifests/fedora-boot.json: $(SRCDIR)/test/data/manifests/f32-build.json
 
 .PHONY: test-data
 test-data: $(TEST_MANIFESTS_GEN)

test/data/README.md

@@ -20,6 +20,9 @@ do not allow comments, this file shortly describes their purpose.
    test-suite needs.
    If they have `build` as part of their name, they have a very restricted
    package set which includes just what is needed in a build-root for osbuild.
+   The `fedora` prefix is used for manifests that are kept up to date to the
+   newest fedora release, and thus do not expose a specific `f30`, `f32`, etc.
+   behavior.
 
    The `rhel` prefix is used for Red Hat Enterprise Linux images. Since they are
    not available publicly, the test-suite usually skips them.

test/data/manifests/mpp-fedora-boot.json

@@ -0,0 +1,95 @@
+{
+  "pipeline": {
+    "build": {
+      "mpp-import-pipeline": {
+        "path": "f32-build.json"
+      },
+      "runner": "org.osbuild.fedora32"
+    },
+    "stages": [
+      {
+        "name": "org.osbuild.rpm",
+        "options": {
+          "gpgkeys": [
+            "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
+          ],
+          "mpp-depsolve": {
+            "architecture": "x86_64",
+            "module-platform-id": "f32",
+            "baseurl": "http://mirrors.kernel.org/fedora/releases/32/Everything/x86_64/os",
+            "repos": [
+              {
+                "id": "default",
+                "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-32&arch=$basearch"
+              }
+            ],
+            "packages": [
+              "@cloud-server-environment",
+              "chrony",
+              "dracut-config-generic",
+              "grub2-pc",
+              "kernel-core",
+              "langpacks-en",
+              "polkit",
+              "selinux-policy-targeted",
+              "systemd-udev"
+            ]
+          }
+        }
+      },
+      {
+        "name": "org.osbuild.locale",
+        "options": {
+          "language": "en_US"
+        }
+      },
+      {
+        "name": "org.osbuild.fstab",
+        "options": {
+          "filesystems": [
+            {
+              "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
+              "vfs_type": "ext4",
+              "path": "/",
+              "freq": 1,
+              "passno": 1
+            }
+          ]
+        }
+      },
+      {
+        "name": "org.osbuild.grub2",
+        "options": {
+          "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
+          "kernel_opts": "ro biosdevname=0 net.ifnames=0",
+          "legacy": "i386-pc"
+        }
+      },
+      {
+        "name": "org.osbuild.test",
+        "options": {
+          "script": "/usr/bin/systemctl is-system-running --wait"
+        }
+      },
+      {
+        "name": "org.osbuild.selinux",
+        "options": {
+          "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
+        }
+      },
+      {
+        "name": "org.osbuild.fix-bls"
+      }
+    ],
+    "assembler": {
+      "name": "org.osbuild.qemu",
+      "options": {
+        "format": "qcow2",
+        "filename": "fedora-boot.qcow2",
+        "ptuuid": "0x1cd1d44b",
+        "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
+        "size": 3221225472
+      }
+    }
+  }
+}

test/run/test_boot.py

@@ -1,13 +1,17 @@
+#
+# Runtime Tests for Bootable Pipelines
+#
 
 import os
 import subprocess
 import tempfile
 import unittest
 
-from . import test
+from .. import test
 
 
-class TestBoot(unittest.TestCase):
+@unittest.skipUnless(test.TestBase.have_test_data(), "no test-data access")
+class TestBoot(test.TestBase):
     def setUp(self):
         self.osbuild = test.OSBuild(self)
 
@@ -16,9 +20,12 @@ class TestBoot(unittest.TestCase):
         # Build an image and test-boot it.
         #
 
+        manifest = os.path.join(self.locate_test_data(),
+                                "manifests/fedora-boot.json")
+
         with self.osbuild as osb:
-            osb.compile_file("test/pipelines/f30-boot.json")
-            with osb.map_output("f30-boot.qcow2") as qcow2, \
+            osb.compile_file(manifest)
+            with osb.map_output("fedora-boot.qcow2") as qcow2, \
                  tempfile.TemporaryDirectory() as d:
 
                 output_file = os.path.join(d, "output")