From 127bbd4dc24a52911ed6b9566170b836c8e62f40 Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Wed, 29 Apr 2026 14:51:44 +0200
Subject: [PATCH 1/2] Update /plans/integration tests

---
 plans/integration.fmf | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/plans/integration.fmf b/plans/integration.fmf
index 709850b2..72b8d1ab 100644
--- a/plans/integration.fmf
+++ b/plans/integration.fmf
@@ -3,23 +3,10 @@ summary:
 discover:
     how: fmf
     url: https://github.com/teemtee/tmt
-    ref: fedora
     filter: 'tier: 1 & tag:-provision-only'
 prepare:
   - how: install
     package:
       - jq
+      - yq
       - python3-pip
-      - tmt-all
-  - how: shell
-    script:
-      # Try to install into .local first, if that fails, try without --user.
-      # In the sane world, tmt would be running in a virtualenv, and we'd
-      # install yq there. Otherwise, we'd change system packages, but we'd
-      # have to run as root to do that, and who's running tmt test suite
-      # as root?
-      #
-      # We need to freeze yq to 3.1.1 so that it's installable on el8 as
-      # newer yq requires tomlkit>=0.11.7 which is python 3.7+ only.
-      - pip3 install --user yq==3.1.1 || pip3 install yq==3.1.1
-      - yq --help

From d21560706d46a6328ac384e866ee116a399d8cda Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Wed, 29 Apr 2026 18:05:30 +0200
Subject: [PATCH 2/2] Use the appropriate tmt reference

---
 .packit.yaml          |  2 ++
 plans/integration.fmf | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/.packit.yaml b/.packit.yaml
index 7418cc98..31c08b66 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -37,6 +37,8 @@ jobs:
   - job: copr_build
     trigger: pull_request
     targets: *targets
+    additional_repos:
+      - "copr://@teemtee/latest"
 
   # Test pull requests
   - job: tests
diff --git a/plans/integration.fmf b/plans/integration.fmf
index 72b8d1ab..f5d3eaa0 100644
--- a/plans/integration.fmf
+++ b/plans/integration.fmf
@@ -2,7 +2,6 @@ summary:
     Run integration tests with tmt
 discover:
     how: fmf
-    url: https://github.com/teemtee/tmt
     filter: 'tier: 1 & tag:-provision-only'
 prepare:
   - how: install
@@ -10,3 +9,28 @@ prepare:
       - jq
       - yq
       - python3-pip
+enabled: false
+
+adjust:
+  - when: initiator == packit
+    because: >
+      We want to test against the tmt main branch
+    prepare+:
+      - how: install
+        copr: "@teemtee/latest"
+    discover+:
+      url: https://github.com/teemtee/tmt
+      ref: main
+    enabled: true
+  - when: initiator == fedora-ci
+    because: >
+      We want to test against the source in Fedora
+    discover+:
+      dist-git-source: true
+      # Technically we do not want to do dist-git-merge, but it is safe for us right now
+      # because there are no clashing test definitions
+      # https://github.com/teemtee/tmt/issues/4840
+      dist-git-merge: true
+      url: https://src.fedoraproject.org/rpms/tmt.git
+      ref: $@{dist-git-branch}
+    enabled: true