From e1c80bdf2cce5ddab6457b8e3a9afe39c5d4dcc1 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Sun, 8 Jun 2025 12:18:26 -0400
Subject: [PATCH] containers-common-1-131.el9

- fetch TMT podman revdep tests from podman dist-git
- needs at least podman 5.4.0-8.el9
- Related: RHEL-80816

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 containers-common.spec      | 10 +++++++-
 plans/containers-common.fmf | 27 --------------------
 plans/system.fmf            | 51 +++++++++++++++++++++++++++++++++++++
 tests/main.fmf              | 14 ----------
 4 files changed, 60 insertions(+), 42 deletions(-)
 delete mode 100644 plans/containers-common.fmf
 create mode 100644 plans/system.fmf
 delete mode 100644 tests/main.fmf

diff --git a/containers-common.spec b/containers-common.spec
index f5301be..a146034 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 130%{?dist}
+Release: 131%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 ExclusiveArch: %{go_arches}
@@ -158,6 +158,9 @@ docker:
          sigstore: https://registry.redhat.io/containers/sigstore
 EOF
 
+# Placeholder check to silence rpmlint
+%check
+
 %files
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/certs.d
@@ -191,6 +194,11 @@ EOF
 %files extra
 
 %changelog
+* Sun Jun 08 2025 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-131
+- fetch TMT podman revdep tests from podman dist-git
+- needs at least podman 5.4.0-8.el9
+- Related: RHEL-80816
+
 * Mon Mar 03 2025 Jindrich Novy <jnovy@redhat.com> - 2:1-130
 - rebuild to preserve upgrade path
 - Related: RHEL-80816
diff --git a/plans/containers-common.fmf b/plans/containers-common.fmf
deleted file mode 100644
index c60fa4f..0000000
--- a/plans/containers-common.fmf
+++ /dev/null
@@ -1,27 +0,0 @@
----
-summary: Run containers-common tests
-description: Test plan for containers-common
-contact: Yuhui Jiang <yujiang@redhat.com>
-
-provision:
-  how: container
-
-prepare:
-  - name: Install packages
-    how: install
-    package: [crun, podman, podman-tests, git]
-  - name: Prepare bats
-    how: shell
-    script:
-      - rm -rf /tmp/bats-core-1.11.0
-      - curl -s -L https://github.com/bats-core/bats-core/archive/refs/tags/v1.11.0.tar.gz | tar xvz -C /tmp
-      - /tmp/bats-core-1.11.0/install.sh /usr
-
-discover:
-  how: fmf
-  filter: 'tag: gate'
-  url: https://gitlab.com/yujiang1/containers-common.git
-  ref: c9s
-
-execute:
-  how: tmt
diff --git a/plans/system.fmf b/plans/system.fmf
new file mode 100644
index 0000000..1edcf58
--- /dev/null
+++ b/plans/system.fmf
@@ -0,0 +1,51 @@
+discover:
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/rpms/podman
+    ref: "c9s"
+
+execute:
+    how: tmt
+
+prepare:
+    - how: shell
+      script: modprobe null_blk nr_devices=1
+      order: 5
+    - how: shell
+      script: |
+        BATS_VERSION=1.12.0
+        curl --fail -L https://github.com/bats-core/bats-core/archive/refs/tags/v"$BATS_VERSION".tar.gz | tar -xz
+        cd bats-core-"$BATS_VERSION"
+        ./install.sh /usr
+        # FIXME: Delete below dnf install once 5.4.0-8 is available in the env
+        dnf -y install https://kojihub.stream.centos.org/kojifiles/packages/podman/5.4.0/8.el9/$(arch)/podman-5.4.0-8.el9.$(arch).rpm https://kojihub.stream.centos.org/kojifiles/packages/podman/5.4.0/8.el9/$(arch)/podman-remote-5.4.0-8.el9.$(arch).rpm https://kojihub.stream.centos.org/kojifiles/packages/podman/5.4.0/8.el9/$(arch)/podman-tests-5.4.0-8.el9.$(arch).rpm
+      order: 10
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+/local-root:
+    summary: Local rootful tests
+    discover+:
+        filter: 'tag:local & tag:root'
+
+/local-rootless:
+    summary: Local rootless tests
+    discover+:
+        filter: 'tag:local & tag:rootless'
+
+/remote-root:
+    summary: Remote rootful tests
+    discover+:
+        filter: 'tag:remote & tag:root'
+
+/remote-rootless:
+    summary: Remote rootless tests
+    discover+:
+        filter: 'tag:remote & tag:rootless'
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index 9880105..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
----
-summary: containers-common tests
-description: Using podman system tests to test containers-common
-contact: Yuhui Jiang <yujiang@redhat.com>
-framework: shell
-require: [podman,containers-common]
-
-tag: 'gate'
-
-test: |
-  /usr/bin/bats -t /usr/share/podman/test/system/030-run.bats
-  /usr/bin/bats -t /usr/share/podman/test/system/075-exec.bats
-
-duration: 15m