diff --git a/.packit.yaml b/.packit.yaml index c9b56ad..75f3395 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -13,9 +13,11 @@ files_to_sync: - src: plans/ dest: plans/ delete: true + mkpath: true - src: test/ dest: test/ delete: true + mkpath: true - src: .fmf/ dest: .fmf/ delete: true @@ -44,10 +46,7 @@ jobs: enable_net: true # container-selinux is noarch so we only need to test on one arch targets: &fedora_copr_targets - - fedora-development - - fedora-latest - - fedora-ltest-stable - - fedora-40 + - fedora-all - job: copr_build trigger: pull_request diff --git a/plans/all.fmf b/plans/main.fmf similarity index 91% rename from plans/all.fmf rename to plans/main.fmf index 9e0d10b..9479e82 100644 --- a/plans/all.fmf +++ b/plans/main.fmf @@ -2,6 +2,9 @@ discover: how: fmf execute: how: tmt +prepare: + how: feature + epel: enabled /upstream: summary: Run SELinux specific Podman tests on upstream PRs diff --git a/test/main.fmf b/test/main.fmf index 8c30075..c369ca7 100644 --- a/test/main.fmf +++ b/test/main.fmf @@ -1,7 +1,9 @@ # Only common dependencies that are NOT required to run podman-tests.sh are # specified here. Everything else is in podman-tests.sh. require: + - bats - cpio + - golang - make - policycoreutils diff --git a/test/podman-tests.sh b/test/podman-tests.sh index b758cc8..d4d45fa 100644 --- a/test/podman-tests.sh +++ b/test/podman-tests.sh @@ -51,10 +51,6 @@ tar zxf *.tar.gz popd -# Install dependencies for running tests -# NOTE: bats will be fetched from Fedora repos on public testing-farm envs if EPEL repo is absent or disabled. -dnf -y install bats golang - # Print versions of distro and installed packages rpm -q bats container-selinux golang podman podman-tests selinux-policy