13 changed files with 113 additions and 52 deletions
--- a/README.md
+++ b/README.md
@ -68,9 +68,6 @@ We also provide a script to generate an [Asahi Installer](https://github.com/Asa

 Please default to submitting PRs against the `rawhide` branch. Release branches should generally merge from `rawhide` and only deviate where absolutely necessary.

-This project is tested using the [Software Factory Zuul CI instance](https://fedora.softwarefactory-project.io/zuul/project/pagure.io/fedora-asahi/kiwi-descriptions)
-using the [Test Management Tool](https://tmt.readthedocs.io/).
-
 ## Licensing

 This is free software: you can redistribute it and/or modify
--- a/builder.py
+++ b/builder.py
@ -195,7 +195,7 @@ def tmtCopy(target):
    image = f"{base}.raw.zst"
    manifest = f"{base}.json"

-    artifacts = os.getenv("TMT_TEST_DATA")
+    artifacts = os.getenv("TMT_PLAN_DATA")
    if not os.path.exists(artifacts):
        os.mkdir(artifacts)

--- a/components/boot.xml
+++ b/components/boot.xml
@ -2,15 +2,13 @@
 	<profiles>
 		<profile name="BootCore" description="Boot core packages"/>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore">
-		<package name="grubby"/>
-	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="uboot-images-armv8" arch="aarch64"/>
+		<package name="grubby"/>
 		<package name="kernel-16k"/>
 		<package name="kernel-16k-modules-extra"/>
 		<package name="systemd-oomd-defaults"/>
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@ -28,20 +28,16 @@
 	<packages type="uninstall" profiles="DesktopCommon">
 		<package name="xorg-x11-server-Xorg"/>
 	</packages>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="GNOME-Desktop">
-		<package name="fedora-release-workstation"/>
-	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<namedCollection name="workstation-product-environment"/>
-	</packages>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Desktop">
-		<package name="fedora-release-kde"/>
+		<package name="fedora-release-workstation"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
 		<namedCollection name="kde-desktop-environment"/>
 		<namedCollection name="kde-apps"/>
 		<namedCollection name="kde-media"/>
 		<package name="fuse"/>
+		<package name="fedora-release-kde"/>
 		<package name="kde-l10n"/>
 		<package name="calamares-firstboot-config"/>
 		<ignore name="@admin-tools"/>
--- a/config.sh
+++ b/config.sh
@ -54,6 +54,12 @@ passwd -l root
 # Setup default services
 #--------------------------------------

+## Enable chrony
+systemctl enable sshd.service
+## Enable NetworkManager
+systemctl enable NetworkManager.service
+## Enable chrony
+systemctl enable chronyd.service
 ## Enable persistent journal
 mkdir -p /var/log/journal

--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@ -89,7 +89,7 @@ popd > /dev/null

 openh264_rpms=$(rpmdistro-repoquery fedora "$release" gstreamer1-plugin-openh264 mozilla-openh264 openh264 --location)

-if [ -e "${openh264_rpms}" ]; then
+if [ -e "${openh264_rpms}"]; then
  extras="{}"
 else
  extras="$(printf '%s\n' "${openh264_rpms}" | newlineToJson)"
--- a/platforms/server.xml
+++ b/platforms/server.xml
@ -18,11 +18,9 @@
 			</oemconfig>
 		</type>
 	</preferences>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Server">
-		<package name="fedora-release-server"/>
-	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Server">
 		<namedCollection name="container-management"/>
 		<namedCollection name="server-product-environment"/>
+		<package name="fedora-release-server"/>
 	</packages>
 </image>
--- a/root/etc/fstab.script
+++ b/root/etc/fstab.script
@ -3,3 +3,8 @@
 # Set ESP mount options to match what Fedora does
 # https://github.com/OSInside/kiwi/issues/2201
 gawk -i inplace '$2 == "/boot/efi" { $4 = $4",umask=0077,shortname=winnt" } { print $0 }' /etc/fstab
+
+# Run selinux relabel at the right time
+# https://github.com/OSInside/kiwi/issues/2192
+# https://github.com/OSInside/kiwi/pull/2282#issuecomment-1514399308
+setfiles -F -p -c /etc/selinux/targeted/policy/policy.* -e /proc -e /sys -e /dev /etc/selinux/targeted/contexts/files/file_contexts /
--- a/tmt/plans/build-gnome.fmf
+++ b/tmt/plans/build-gnome.fmf
@ -1,7 +1,28 @@
 summary: Build GNOME image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
-    how: fmf
-environment:
-    image_variant: gnome
+    how: shell
+    tests:
+      - name: build image
+        test: |
+          setenforce 0
+          $TMT_TREE/builder.py build gnome
+          $TMT_TREE/builder.py package gnome
+          $TMT_TREE/builder.py tmt gnome
+          setenforce 1
+
 execute:
    how: tmt
--- a/tmt/plans/build-kde.fmf
+++ b/tmt/plans/build-kde.fmf
@ -1,7 +1,28 @@
 summary: Build KDE image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
-    how: fmf
-environment:
-    image_variant: kde
+    how: shell
+    tests:
+      - name: build image
+        test: |
+          setenforce 0
+          $TMT_TREE/builder.py build kde
+          $TMT_TREE/builder.py package kde
+          $TMT_TREE/builder.py tmt kde
+          setenforce 1
+
 execute:
    how: tmt
--- a/tmt/plans/build-minimal.fmf
+++ b/tmt/plans/build-minimal.fmf
@ -1,7 +1,28 @@
 summary: Build Minimal image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
-    how: fmf
-environment:
-    image_variant: minimal
+    how: shell
+    tests:
+      - name: build image
+        test: |
+          setenforce 0
+          $TMT_TREE/builder.py build minimal
+          $TMT_TREE/builder.py package minimal
+          $TMT_TREE/builder.py tmt minimal
+          setenforce 1
+
 execute:
    how: tmt
--- a/tmt/plans/build-server.fmf
+++ b/tmt/plans/build-server.fmf
@ -1,7 +1,28 @@
 summary: Build Server image
+prepare:
+  - name: install packages
+    how: install
+    package:
+      - distribution-gpg-keys
+      - fatcat
+      - git-core
+      - kiwi
+      - libselinux-utils
+      - p7zip-plugins
+      - python3-boto3
+      - rpmdistro-repoquery
+      - zip
+      - zstd
 discover:
-    how: fmf
-environment:
-    image_variant: server
+    how: shell
+    tests:
+      - name: build image
+        test: |
+          setenforce 0
+          $TMT_TREE/builder.py build server
+          $TMT_TREE/builder.py package server
+          $TMT_TREE/builder.py tmt server
+          setenforce 1
+
 execute:
    how: tmt
--- a/tmt/tests/build-image.fmf
+++ b/tmt/tests/build-image.fmf
@ -1,23 +0,0 @@
-summary: Build image
-require:
-  - distribution-gpg-keys
-  - fatcat
-  - git-core
-  - kiwi
-  - kiwi-systemdeps-disk-images
-  - libselinux-utils
-  - p7zip-plugins
-  - python3-boto3
-  - python3-click
-  - rpmdistro-repoquery
-  - zip
-  - zstd
-framework: shell
-path: /
-test: |
-  setenforce 0
-  ./builder.py build $image_variant
-  ./builder.py package $image_variant
-  ./builder.py tmt $image_variant
-  setenforce 1
-duration: 60m