test: Add Packit and gating test

henrywang · henrywang · commit cde5644cd5d5 · 2025-09-24T23:10:58.000+08:00
Use 'system-reinstall-bootc' to re-install TF runner from package mode
to image mode

Signed-off-by: Xiaofeng Wang &lt;henrywangxf@me.com&gt;
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: Run all TMT tests
         run: |
-          just test-tmt-nobuild
+          just test-tmt-nobuild plans --filter 'tag:unify'
 
       - name: Archive TMT logs
         if: always()
diff --git a/.packit.yaml b/.packit.yaml
@@ -64,21 +64,19 @@ jobs:
       failure_comment:
         message: "bootc Copr build failed for {commit_sha}. @admin check logs {logs_url} and packit dashboard {packit_dashboard_url}"
 
-  # TODO: Readd some tmt tests that install the built RPM and e.g. test out system-reinstall-bootc
-  # - 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-42-x86_64
-  #     - fedora-42-aarch64
-  #     - fedora-rawhide-x86_64
-  #     - fedora-rawhide-aarch64
-  #   tmt_plan: /integration
-  #   skip_build: true
-  #   identifier: integration-test
+  - 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-42-x86_64
+      - fedora-42-aarch64
+      - fedora-rawhide-x86_64
+      - fedora-rawhide-aarch64
+    tmt_plan: /integration
+    identifier: test
 
   - job: propose_downstream
     trigger: release
diff --git a/hack/Containerfile.packit b/hack/Containerfile.packit
@@ -0,0 +1,34 @@
+# Build image for system-reinstall-bootc test
+
+# Use centos-bootc:10 as default
+FROM quay.io/centos-bootc/centos-bootc:stream10
+
+WORKDIR /bootc-test
+
+# Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
+COPY bin /usr/local/bin
+
+RUN <<EORUN
+set -xeuo pipefail
+. /usr/lib/os-release
+if [[ $ID == "rhel" ]]; then
+    cp rhel.repo /etc/yum.repos.d/
+fi
+cp test-artifacts.repo /etc/yum.repos.d/
+dnf -y update bootc
+./provision-derived.sh
+
+# For test-22-logically-bound-install
+cp -a lbi/usr/. /usr
+for x in curl.container curl-base.image podman.image; do
+    ln -s /usr/share/containers/systemd/$x /usr/lib/bootc/bound-images.d/$x
+done
+
+# Add some testing kargs into our dev builds
+install -D -t /usr/lib/bootc/kargs.d test-kargs/*
+# Also copy in some default install configs we use for testing
+install -D -t /usr/lib/bootc/install/ install-test-configs/*
+
+# Finally, test our own linting
+bootc container lint --fatal-warnings
+EORUN
diff --git a/hack/bin/aws b/hack/bin/aws
@@ -0,0 +1 @@
+/usr/local/aws-cli/v2/current/bin/aws
diff --git a/hack/bin/aws_completer b/hack/bin/aws_completer
@@ -0,0 +1 @@
+/usr/local/aws-cli/v2/current/bin/aws_completer
diff --git a/hack/bin/tomlq b/hack/bin/tomlq
@@ -0,0 +1,8 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import re
+import sys
+from yq import tq_cli
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(tq_cli())
diff --git a/hack/bin/xq b/hack/bin/xq
@@ -0,0 +1,8 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import re
+import sys
+from yq import xq_cli
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(xq_cli())
diff --git a/hack/bin/yq b/hack/bin/yq
@@ -0,0 +1,8 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import re
+import sys
+from yq import cli
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(cli())
diff --git a/hack/test-artifacts.repo b/hack/test-artifacts.repo
@@ -0,0 +1,6 @@
+[bootc]
+name=bootc
+baseurl=https://download.copr.fedorainfracloud.org/results/packit/bootc-dev-bootc-1642/fedora-42-$basearch/
+enabled=1
+gpgcheck=0
+repo_gpgcheck=0
diff --git a/tmt/plans/integration.fmf b/tmt/plans/integration.fmf
@@ -4,51 +4,66 @@ provision:
   image: $@{test_disk_image}
 execute:
   how: tmt
+  exit-first: true
 
-/readonly-tests:
+/test-00-system-reinstall-bootc:
+  summary: Run system-reinstall-bootc in package mode machine
+  discover:
+    how: fmf
+    test:
+        - /tmt/tests/test-00-system-reinstall-bootc
+
+/test-01-readonly:
   summary: Execute booted readonly/nondestructive tests
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-01-readonly
 
 /test-20-local-upgrade:
   summary: Execute local upgrade tests
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-20-local-upgrade
 
 /test-21-logically-bound-switch:
   summary: Execute logically bound images tests for switching images
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-21-logically-bound-switch
 
 /test-22-logically-bound-install:
   summary: Execute logically bound images tests for switching images
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-22-logically-bound-install
 
 /test-23-install-outside-container:
   summary: Execute tests for installing outside of a container
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-23-install-outside-container
 
 /test-24-local-upgrade-reboot:
   summary: Execute local upgrade tests with automated reboot
+  tag: unify
   discover:
     how: fmf
     test:
         - /tmt/tests/test-24-local-upgrade-reboot
 
 /test-25-soft-reboot:
   summary: Soft reboot support
+  tag: unify
   discover:
     how: fmf
     test:
diff --git a/tmt/tests/system-reinstall/test-system-reinstall-bootc.sh b/tmt/tests/system-reinstall/test-system-reinstall-bootc.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+set -exuo pipefail
+
+# Check environment
+printenv
+
+# This script only runs on Packit and gating environment
+if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+    pwd
+    # change to hack directory
+    cd ../../hack
+
+    ARCH=$(uname -m)
+    # Get OS info
+    source /etc/os-release
+    case "$ID" in
+        "centos")
+            BASE="quay.io/centos-bootc/centos-bootc:stream${VERSION_ID}"
+            TEST_OS="${ID}-stream-${VERSION_ID}"
+            # Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
+            cp -r /usr/local/bin .
+            ;;
+        "fedora")
+            BASE="quay.io/fedora/fedora-bootc:${VERSION_ID}"
+            TEST_OS="${ID}-${VERSION_ID}"
+            if [[ "$VERSION_ID" == 44 ]]; then
+                TEST_OS="${ID}-rawhide"
+            fi
+            # Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
+            cp -r /usr/local/bin .
+            ;;
+        "rhel")
+            # OSCI gating only
+            BASE="images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}"
+            # Some rhts-*, rstrnt-* and tmt-* commands are in /var/lib/tmt/scripts
+            cp -r /var/lib/tmt/scripts ./bin
+
+            CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${BASE}" | jq -r '.Labels."redhat.compose-id"')
+
+            if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
+                if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
+                    BATCH_COMPOSE="updates/"
+                else
+                    BATCH_COMPOSE=""
+                fi
+            else
+                BATCH_COMPOSE="updates/"
+                CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
+            fi
+
+            # use latest compose if specific compose is not accessible
+            RC=$(curl -skIw '%{http_code}' -o /dev/null "http://${NIGHTLY_COMPOSE_SITE}/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
+            if [[ $RC != "200" ]]; then
+                CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
+            fi
+
+            # generate rhel repo
+            tee "rhel.repo" >/dev/null <<REPOEOF
+[rhel-baseos]
+name=baseos
+baseurl=http://${NIGHTLY_COMPOSE_SITE}/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
+enabled=1
+gpgcheck=0
+
+[rhel-appstream]
+name=appstream
+baseurl=http://${NIGHTLY_COMPOSE_SITE}/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
+enabled=1
+gpgcheck=0
+REPOEOF
+            cp rhel.repo /etc/yum.repos.d
+            ;;
+    esac
+
+    # Fedora CI: https://github.com/fedora-ci/dist-git-pipeline/blob/master/Jenkinsfile#L145
+    # OSCI: https://gitlab.cee.redhat.com/osci-pipelines/dist-git-pipeline/-/blob/master/Jenkinsfile?ref_type=heads#L93
+    if [[ -v KOJI_TASK_ID ]] || [[ -v CI_KOJI_TASK_ID ]]; then
+        # Just left those ls commands here to ring the bell for me when something changed
+        echo "$TMT_SOURCE_DIR"
+        ls -al "$TMT_SOURCE_DIR"
+        ls -al "$TMT_SOURCE_DIR/SRPMS"
+        ls -al /etc/yum.repos.d
+        cat /etc/yum.repos.d/test-artifacts.repo
+        ls -al /var/share/test-artifacts
+        # copy bootc rpm repo into image building root
+        cp /etc/yum.repos.d/test-artifacts.repo ../../hack/
+    # Packit
+    else
+        tee "test-artifacts.repo" <<PACKITEOF
+[bootc]
+name=bootc
+baseurl=https://download.copr.fedorainfracloud.org/results/${PACKIT_COPR_PROJECT}/${TEST_OS}-\$basearch/
+enabled=1
+gpgcheck=0
+repo_gpgcheck=0
+PACKITEOF
+    fi
+
+    # Let's check things in hack folder
+    ls -al . bin
+
+    # Do not use just because it's only available on Fedora, not on CS and RHEL
+    podman build --jobs=4 --from "$BASE" -v "$(pwd)":/bootc-test:z -t localhost/bootc-integration -f Containerfile.packit .
+
+    # Keep these in sync with what's used in hack/lbi
+    podman pull -q --retry 5 --retry-delay 5s quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest
+
+    # Install system-reinstall-bootc
+    dnf install -y system-reinstall-bootc
+
+    # Run system-reinstall-bootc
+    expect - <<'EOF'
+set timeout 600
+
+spawn system-reinstall-bootc localhost/bootc-integration
+expect "Then you can login as * using those keys. \\\[Y/n\\\]" {
+send "\r"
+}
+expect "NOTICE: This will replace the installed operating system and reboot. Are you sure you want to continue? \\\[y/N\\\]" {
+send "Y"
+}
+expect "NOTICE: This will replace the installed operating system and reboot. Are you sure you want to continue? \\\[Y/n\\\]" {
+send "\r"
+}
+expect eof
+EOF
+
+    # Reboot
+    tmt-reboot
+elif [ "$TMT_REBOOT_COUNT" -eq 1 ]; then
+    # Some simple and fast checkings
+    bootc status
+    echo "$PATH"
+    printenv
+    ls -al /var/ARTIFACTS
+    ls -al /usr/local/bin
+    echo "Bootc system on TMT/TF runner"
+
+    exit 0
+fi
diff --git a/tmt/tests/test-00-system-reinstall-bootc.fmf b/tmt/tests/test-00-system-reinstall-bootc.fmf
@@ -0,0 +1,3 @@
+summary: Run system-reinstall-bootc test
+test: system-reinstall/test-system-reinstall-bootc.sh
+duration: 30m

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/usr/local/aws-cli/v2/current/bin/aws_completer`