From 98201fec06826ec43cafa437541aa6e52b3de577 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Wed, 31 Jul 2024 18:35:05 +0800
Subject: [PATCH] test: add centos stream 10 rpm build and e2e test

Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
---
 .packit.yaml                            | 10 +++++++++-
 plans/e2e.fmf                           |  9 +--------
 tests/e2e/bootc-install.sh              |  9 ++++++++-
 tests/e2e/playbooks/deploy-libvirt.yaml |  4 +++-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.packit.yaml b/.packit.yaml
index c3918469..63ef2972 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -44,6 +44,10 @@ jobs:
       - centos-stream-9-aarch64
       - centos-stream-9-ppc64le
       - centos-stream-9-s390x
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
+      - centos-stream-10-ppc64le
+      - centos-stream-10-s390x
       - fedora-40-x86_64
       - fedora-40-aarch64
       - fedora-40-ppc64le
@@ -65,11 +69,14 @@ jobs:
     skip_build: true
     identifier: integration-test
 
+  # To avoid https://issues.redhat.com/browse/TFT-2691
+  # x86_64 tf runner is not enough now
   - job: tests
     trigger: pull_request
     targets:
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
+      - centos-stream-10-aarch64
       - fedora-40-x86_64
     tmt_plan: /to-existing-root
     identifier: e2e-test-to-existing-root
@@ -77,8 +84,9 @@ jobs:
   - job: tests
     trigger: pull_request
     targets:
-      - centos-stream-9-x86_64
       - centos-stream-9-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-10-aarch64
       - fedora-40-aarch64
     tmt_plan: /to-disk
     identifier: e2e-test-to-disk
diff --git a/plans/e2e.fmf b/plans/e2e.fmf
index 587b5a54..563dccf5 100644
--- a/plans/e2e.fmf
+++ b/plans/e2e.fmf
@@ -11,13 +11,6 @@ adjust:
         virtualization:
           is-supported: true
 prepare:
-  - how: shell
-    script: |
-      source /etc/os-release
-      if [[ "$ID" == "centos" ]]; then
-          # EPEL for genisoimage
-          dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
-      fi
   - how: install
     package:
       - ansible-core
@@ -30,7 +23,7 @@ prepare:
       - qemu-kvm
       - libvirt
       - virt-install
-      - genisoimage
+      - xorriso
   - how: shell
     script: ansible-galaxy collection install https://ansible-collection.s3.amazonaws.com/ansible-posix-1.5.4.tar.gz https://ansible-collection.s3.amazonaws.com/community-general-8.5.0.tar.gz
 execute:
diff --git a/tests/e2e/bootc-install.sh b/tests/e2e/bootc-install.sh
index 9976572d..ee19b041 100755
--- a/tests/e2e/bootc-install.sh
+++ b/tests/e2e/bootc-install.sh
@@ -41,11 +41,18 @@ source /etc/os-release
 case ""${ID}-${VERSION_ID}"" in
     "centos-9")
         TEST_OS="centos-stream-9"
-        TIER1_IMAGE_URL="quay.io/centos-bootc/centos-bootc-dev:stream9"
+        TIER1_IMAGE_URL="quay.io/centos-bootc/centos-bootc:stream9"
         SSH_USER="cloud-user"
         REDHAT_VERSION_ID="9"
         BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
+    "centos-10")
+        TEST_OS="centos-stream-10"
+        TIER1_IMAGE_URL="quay.io/centos-bootc/centos-bootc:stream10"
+        SSH_USER="cloud-user"
+        REDHAT_VERSION_ID="10"
+        BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
+        ;;
     "fedora-"*)
         TEST_OS="fedora-${VERSION_ID}"
         TIER1_IMAGE_URL="quay.io/fedora/fedora-bootc:${VERSION_ID}"
diff --git a/tests/e2e/playbooks/deploy-libvirt.yaml b/tests/e2e/playbooks/deploy-libvirt.yaml
index 7cda1918..7541bfa6 100644
--- a/tests/e2e/playbooks/deploy-libvirt.yaml
+++ b/tests/e2e/playbooks/deploy-libvirt.yaml
@@ -14,6 +14,7 @@
     boot_args: ""
     os_variant:
       centos-stream-9: centos-stream9
+      centos-stream-10: centos-stream9
       fedora-40: fedora-unknown
       fedora-41: fedora-unknown
 
@@ -116,7 +117,8 @@
     # Then the --cloud-init will be dropped when start after system reset
     - name: Generate seed.iso for NoCloud cloud-init
       command: |
-        genisoimage -output "{{ image_path }}/seed.iso" \
+        xorriso -as mkisofs -input-charset utf8 \
+          -o "{{ image_path  }}/seed.iso" \
           -volid cidata \
           -joliet \
           -rock \