From 1f7dbe64d13fe5f1bc7a357d2abe27a969245abc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Dec 2024 17:14:15 +0530 Subject: [PATCH 1/2] [skip-ci] Packit: remove epel/rhel copr targets rhel copr targets are often outdated causing failed builds and tests. Best to only have CentOS Stream targets upstream, so we ensure everything that enters RHEL at some point has been tested upstream. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index d5416e0f5..655b0db02 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,9 +13,6 @@ packages: downstream_package_name: containers-common pkg_tool: centpkg specfile_path: rpm/containers-common.spec - containers-common-rhel: - downstream_package_name: containers-common - specfile_path: rpm/containers-common.spec containers-common-eln: downstream_package_name: containers-common specfile_path: rpm/containers-common.spec @@ -56,14 +53,6 @@ jobs: - centos-stream-9 - centos-stream-10 - - job: copr_build - trigger: pull_request - packages: [containers-common-rhel] - notifications: *ephemeral_build_failure_notification - enable_net: true - targets: - - epel-9 - # Run on commit to main branch - job: copr_build trigger: commit From 60460bd3c9437331856b1e81af6bb23e5f9c53a2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 25 Dec 2024 17:05:59 +0530 Subject: [PATCH 2/2] TMT: revdep tests Co-authored-by: Chris Evich Signed-off-by: Lokesh Mandvekar --- .fmf/version | 1 + .packit.yaml | 39 ++++++++++++++++++++++++++++++++------- plans/buildah.fmf | 38 ++++++++++++++++++++++++++++++++++++++ plans/podman.fmf | 38 ++++++++++++++++++++++++++++++++++++++ plans/skopeo.fmf | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/buildah.fmf create mode 100644 plans/podman.fmf create mode 100644 plans/skopeo.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.packit.yaml b/.packit.yaml index 655b0db02..c9949688d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,13 +28,14 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true - targets: - - fedora-all + targets: &fedora_copr_targets + - fedora-all-x86_64 + - fedora-all-aarch64 - job: copr_build trigger: pull_request packages: [containers-common-eln] - notifications: *ephemeral_build_failure_notification + #notifications: *ephemeral_build_failure_notification enable_net: true targets: fedora-eln: @@ -47,11 +48,13 @@ jobs: - job: copr_build trigger: pull_request packages: [containers-common-centos] - notifications: *ephemeral_build_failure_notification + #notifications: *ephemeral_build_failure_notification enable_net: true - targets: - - centos-stream-9 - - centos-stream-10 + targets: ¢os_copr_targets + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 # Run on commit to main branch - job: copr_build @@ -65,6 +68,28 @@ jobs: project: podman-next enable_net: true + - job: tests + trigger: pull_request + packages: [containers-common-fedora] + targets: *fedora_copr_targets + enable_net: true + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + + - job: tests + trigger: pull_request + packages: [containers-common-centos] + targets: *centos_copr_targets + enable_net: true + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo + - job: propose_downstream trigger: release packages: [containers-common-fedora] diff --git a/plans/buildah.fmf b/plans/buildah.fmf new file mode 100644 index 000000000..4fe17128c --- /dev/null +++ b/plans/buildah.fmf @@ -0,0 +1,38 @@ +prepare: + - name: packages + how: install + package: [skopeo-tests] + +adjust: + - when: "initiator == packit" + because: "We need to test with updated packages from rhcontainerbot/podman-next copr" + prepare: + how: shell + script: | + sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y upgrade --allowerasing + # FIXME: Use epel10 once bats is available there + - when: distro == centos-stream-10 or distro == rhel-10 + because: "bats isn't yet available on epel10" + prepare: + how: install + copr: rhcontainerbot/bats-el10 + package: bats + - when: distro == centos-stream-9 or distro == rhel-9 + because: "bats is present on EPEL on rhel9 / c9s" + prepare: + how: feature + epel: enabled + +discover: + how: fmf + url: https://github.com/lsm5/buildah + ref: "tmt-system-tests" + +execute: + how: tmt + +/system: + summary: Run buildah system tests + discover+: + test: /tests/tmt diff --git a/plans/podman.fmf b/plans/podman.fmf new file mode 100644 index 000000000..71c8adc8b --- /dev/null +++ b/plans/podman.fmf @@ -0,0 +1,38 @@ +prepare: + - name: packages + how: install + package: [bats, podman-tests] + +adjust: + - when: "initiator == packit" + because: "We need to test with updated packages from rhcontainerbot/podman-next copr" + prepare: + how: shell + script: | + sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y upgrade --allowerasing + # FIXME: Use epel10 once bats is available there + - when: distro == centos-stream-10 or distro == rhel-10 + because: "bats isn't yet available on epel10" + prepare: + how: install + copr: rhcontainerbot/bats-el10 + package: bats + - when: distro == centos-stream-9 or distro == rhel-9 + because: "bats is present on EPEL on rhel9 / c9s" + prepare: + how: feature + epel: enabled + +discover: + how: fmf + url: https://github.com/lsm5/podman + ref: "tmt-fedora-centos" + +execute: + how: tmt + +/system: + summary: Run podman system tests + discover+: + test: /test/tmt/system/* diff --git a/plans/skopeo.fmf b/plans/skopeo.fmf new file mode 100644 index 000000000..dbd4e4677 --- /dev/null +++ b/plans/skopeo.fmf @@ -0,0 +1,38 @@ +prepare: + - name: packages + how: install + package: [skopeo-tests] + +adjust: + - when: "initiator == packit" + because: "We need to test with updated packages from rhcontainerbot/podman-next copr" + prepare: + how: shell + script: | + sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo + dnf -y upgrade --allowerasing + # FIXME: Use epel10 once bats is available there + - when: distro == centos-stream-10 or distro == rhel-10 + because: "bats isn't yet available on epel10" + prepare: + how: install + copr: rhcontainerbot/bats-el10 + package: bats + - when: distro == centos-stream-9 or distro == rhel-9 + because: "bats is present on EPEL on rhel9 / c9s" + prepare: + how: feature + epel: enabled + +discover: + how: fmf + url: https://github.com/lsm5/skopeo + ref: "packit-gating-tests" + +execute: + how: tmt + +/system: + summary: Run skopeo system tests + discover+: + test: /systemtest/tmt