From 8b64708fe785c556a20640fe19857d910d8ad1a1 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 29 Apr 2026 18:35:25 +0200 Subject: [PATCH 1/2] Pick the right tmt sources for friends plan --- plans/friends/beakerlib.fmf | 4 +--- plans/friends/main.fmf | 22 ++++++++++++++++++++++ plans/friends/podman.fmf | 8 +++----- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/plans/friends/beakerlib.fmf b/plans/friends/beakerlib.fmf index 0a6fdc4bbe..fdf4b9d401 100644 --- a/plans/friends/beakerlib.fmf +++ b/plans/friends/beakerlib.fmf @@ -5,9 +5,7 @@ description: beakerlib is working as expected. This plan is run for upstream pull requests in the beakerlib repository. -discover: - how: fmf - url: https://github.com/teemtee/tmt +discover+: filter: "tag:beakerlib & tag:-provision-only" link: diff --git a/plans/friends/main.fmf b/plans/friends/main.fmf index 3c8c8e581d..0efb82ed97 100644 --- a/plans/friends/main.fmf +++ b/plans/friends/main.fmf @@ -1,6 +1,28 @@ execute: how: tmt +discover: + how: fmf + +adjust: + - when: initiator == packit + because: > + We want to test against the tmt main branch + prepare+: + - order: 40 + how: install + copr: "@teemtee/latest" + discover+: + url: https://github.com/teemtee/tmt + ref: main + - when: initiator == fedora-ci + because: > + We want to test against the source in Fedora + discover+: + dist-git-source: true + url: https://src.fedoraproject.org/rpms/tmt.git + ref: $@{dist-git-branch} + prepare: # Install jq and yq for cleaner tests - how: install diff --git a/plans/friends/podman.fmf b/plans/friends/podman.fmf index fb99ccfaa8..ec9db85ec6 100644 --- a/plans/friends/podman.fmf +++ b/plans/friends/podman.fmf @@ -6,15 +6,13 @@ description: is supposed to be run for podman, crun, container-selinux and friends pull requests to prevent introducing breaking changes. -discover: - how: fmf - url: https://github.com/teemtee/tmt +discover+: filter: "tag:podman" adjust-tests: - check: avc -prepare: - name: enable-epel +prepare+: + - name: enable-epel how: feature epel: enabled order: 20 From 39ffd7ccc259d3e2b69fac805754b9179d78fe73 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 29 Apr 2026 18:40:08 +0200 Subject: [PATCH 2/2] Make the top-level plan selectable for simpler extension --- plans/friends/main.fmf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plans/friends/main.fmf b/plans/friends/main.fmf index 0efb82ed97..1efc59b15f 100644 --- a/plans/friends/main.fmf +++ b/plans/friends/main.fmf @@ -1,3 +1,6 @@ +/: + select: true + execute: how: tmt