From 5e3626c41af5e057c378ae93fa8fe43b4c414702 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Tue, 8 Aug 2023 15:28:36 +0200
Subject: [PATCH] packit: Build PRs into default packit COPRs

Building all PRs of all container projects into the same COPR does not
properly isolate PRs from each other.

To avoid that, change the copr_build configuration to use the packit
default COPRs, which are specific to the particular PR, and disappear
after a few weeks. Depending projects should only run against what
landed in gvisor-tap-vsock/main i.e. the podman-next COPR.

Unmerging the two copr jobs allows us the redundant targets: list for the
"main" builds into podman-next. Specifying the target list is not necessary
any more since https://github.com/packit/packit-service/issues/1499 got fixed.

Signed-off-by: Martin Pitt <mpitt@redhat.com>
---
 .packit.yaml | 47 +++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/.packit.yaml b/.packit.yaml
index 6a44b113f..744ae059c 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -9,15 +9,14 @@
 specfile_path: rpm/gvisor-tap-vsock.spec
 upstream_tag_template: v{version}
 
+srpm_build_deps:
+  - make
+
 jobs:
-  - &copr
-    job: copr_build
+  - job: copr_build
     trigger: pull_request
-    owner: rhcontainerbot
-    project: packit-builds
     enable_net: true
-    srpm_build_deps:
-      - make
+    # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next
     targets:
       - fedora-rawhide-aarch64
       - fedora-rawhide-x86_64
@@ -25,36 +24,20 @@ jobs:
       - fedora-eln-x86_64
       - fedora-38-aarch64
       - fedora-38-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-9-x86_64
-      - centos-stream-8-aarch64
-      - centos-stream-8-x86_64
+      - centos-stream+epel-next-8-x86_64
+      - centos-stream+epel-next-8-aarch64
+      - centos-stream+epel-next-9-x86_64
+      - centos-stream+epel-next-9-aarch64
+    additional_repos:
+      - "copr://rhcontainerbot/podman-next"
 
-  - <<: *copr
-    # Run on commit to main branch
+  # Run on commit to main branch
+  - job: copr_build
     trigger: commit
+    enable_net: true
     branch: main
+    owner: rhcontainerbot
     project: podman-next
-    targets:
-      - fedora-rawhide-aarch64
-      - fedora-rawhide-ppc64le
-      - fedora-rawhide-s390x
-      - fedora-rawhide-x86_64
-      - fedora-eln-aarch64
-      - fedora-eln-ppc64le
-      - fedora-eln-s390x
-      - fedora-eln-x86_64
-      - fedora-38-aarch64
-      - fedora-38-ppc64le
-      - fedora-38-s390x
-      - fedora-38-x86_64
-      - centos-stream+epel-next-9-aarch64
-      - centos-stream+epel-next-9-ppc64le
-      - centos-stream+epel-next-9-s390x
-      - centos-stream+epel-next-9-x86_64
-      - centos-stream+epel-next-8-aarch64
-      - centos-stream+epel-next-8-ppc64le
-      - centos-stream+epel-next-8-x86_64
 
   - job: propose_downstream
     trigger: release