From d9d9c7c6955bd79f828f1f3dd7ee5ebabbe7d5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Tue, 7 Jan 2025 17:25:58 +0100 Subject: [PATCH 1/5] Enable the `stable` copr repository for building This would allow us to test with fresh `fmf` bits as soon as they are released. We would not have to wait until packages reach the stable fedora repositories. --- .packit.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 6ce4625cd1..579eeac426 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -34,6 +34,8 @@ _: # Copr jobs under the packit project - &copr-under-packit job: copr_build + additional_repos: + - copr://@teemtee/stable # Copr jobs under the teemtee project - &copr-under-teemtee @@ -46,6 +48,14 @@ _: - &test-base job: tests trigger: pull_request + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/fedora-rawhide/group_teemtee-stable-fedora-rawhide.repo + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/epel-9/group_teemtee-stable-epel-9.repo + # Latest fedora & epel targets - &latest-targets From 1fca05bfe056c1379dbe19e3e774a0b47451c0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Thu, 9 Jan 2025 09:40:32 +0100 Subject: [PATCH 2/5] Try to require a package that is only in the stable repo --- tmt.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tmt.spec b/tmt.spec index 6728990135..14bba0dc36 100644 --- a/tmt.spec +++ b/tmt.spec @@ -9,8 +9,10 @@ Source0: %{pypi_source tmt} BuildArch: noarch BuildRequires: python3-devel +BuildRequires: dyd >= 0.22 Requires: git-core rsync sshpass +Requires: dyd >= 0.22 %if 0%{?fedora} < 40 Obsoletes: python3-tmt < %{version}-%{release} From eddee14d1d761f3247a9663185c4d4be0ae1e59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Fri, 10 Jan 2025 09:43:14 +0100 Subject: [PATCH 3/5] Enable the repo for internal jobs as well --- .packit.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 579eeac426..3b7b4389a9 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -50,13 +50,13 @@ _: trigger: pull_request tf_extra_params: environments: - - artifacts: + - &copr-teemtee-stable + artifacts: - type: repository-file id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/fedora-rawhide/group_teemtee-stable-fedora-rawhide.repo - type: repository-file id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/epel-9/group_teemtee-stable-epel-9.repo - # Latest fedora & epel targets - &latest-targets - fedora-latest-stable @@ -70,6 +70,7 @@ _: tf_extra_params: environments: - &tmt-cloud-resources + <<: *copr-teemtee-stable settings: provisioning: tags: From 6aeb5a46128009c1453b624248501d73585d71cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Fri, 10 Jan 2025 10:19:47 +0100 Subject: [PATCH 4/5] Fix the `provision` job environment Needs to be a single dict, not two environments. --- .packit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index 3b7b4389a9..e892d74f99 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -135,7 +135,7 @@ jobs: - tmt: context: how: provision - - *tmt-cloud-resources + <<: *tmt-cloud-resources # Test internal plugins - <<: *test-base From d6f872a8dbce241610551c27d58099d43d214b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Tue, 14 Jan 2025 13:26:56 +0100 Subject: [PATCH 5/5] Drop the testing requires --- tmt.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tmt.spec b/tmt.spec index 14bba0dc36..6728990135 100644 --- a/tmt.spec +++ b/tmt.spec @@ -9,10 +9,8 @@ Source0: %{pypi_source tmt} BuildArch: noarch BuildRequires: python3-devel -BuildRequires: dyd >= 0.22 Requires: git-core rsync sshpass -Requires: dyd >= 0.22 %if 0%{?fedora} < 40 Obsoletes: python3-tmt < %{version}-%{release}