From a847a1201f2778db68491bef619abbf80450fec4 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 15 Nov 2023 17:32:24 +0100
Subject: [PATCH] Use an include file for pulpcore copr versions

This uses the same approach as for Koji, but also makes it explicit
which is which.

It drops the pulpcore nightly koji job.
---
 centos.org/jobs/pulpcore-pipelines.yml        | 16 +++++++++++++--
 .../includes/pulpcore_versions_copr.yaml.inc  |  1 +
 ...ml.inc => pulpcore_versions_koji.yaml.inc} |  1 -
 .../pipeline/pulpcore-release-pipelines.yaml  | 12 +++++++++--
 .../pulpcore-packaging-rpm-release.yaml       | 20 +++++++++----------
 5 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 theforeman.org/yaml/includes/pulpcore_versions_copr.yaml.inc
 rename theforeman.org/yaml/includes/{pulpcore_versions.yaml.inc => pulpcore_versions_koji.yaml.inc} (81%)

diff --git a/centos.org/jobs/pulpcore-pipelines.yml b/centos.org/jobs/pulpcore-pipelines.yml
index b442747d..42de0f7b 100644
--- a/centos.org/jobs/pulpcore-pipelines.yml
+++ b/centos.org/jobs/pulpcore-pipelines.yml
@@ -1,11 +1,23 @@
 ---
 - project:
-    name: pulpcore
+    name: pulpcore-koji
     jobs:
       - 'foreman-pipeline-{type}-{flavor}-{version}'
     empty: ''
     version:
-      !include: ../../theforeman.org/yaml/includes/pulpcore_versions.yaml.inc
+      !include: ../../theforeman.org/yaml/includes/pulpcore_versions_koji.yaml.inc
+    type:
+      - pulpcore
+    flavor:
+      - rpm
+
+- project:
+    name: pulpcore-copr
+    jobs:
+      - 'foreman-pipeline-{type}-{flavor}-{version}'
+    empty: ''
+    version:
+      !include: ../../theforeman.org/yaml/includes/pulpcore_versions_copr.yaml.inc
     type:
       - pulpcore
     flavor:
diff --git a/theforeman.org/yaml/includes/pulpcore_versions_copr.yaml.inc b/theforeman.org/yaml/includes/pulpcore_versions_copr.yaml.inc
new file mode 100644
index 00000000..68f24a22
--- /dev/null
+++ b/theforeman.org/yaml/includes/pulpcore_versions_copr.yaml.inc
@@ -0,0 +1 @@
+- 'nightly'
diff --git a/theforeman.org/yaml/includes/pulpcore_versions.yaml.inc b/theforeman.org/yaml/includes/pulpcore_versions_koji.yaml.inc
similarity index 81%
rename from theforeman.org/yaml/includes/pulpcore_versions.yaml.inc
rename to theforeman.org/yaml/includes/pulpcore_versions_koji.yaml.inc
index e988896c..7c40fca6 100644
--- a/theforeman.org/yaml/includes/pulpcore_versions.yaml.inc
+++ b/theforeman.org/yaml/includes/pulpcore_versions_koji.yaml.inc
@@ -4,4 +4,3 @@
 - '3.21'
 - '3.22'
 - '3.28'
-- 'nightly'
diff --git a/theforeman.org/yaml/jobs/pipeline/pulpcore-release-pipelines.yaml b/theforeman.org/yaml/jobs/pipeline/pulpcore-release-pipelines.yaml
index eba2ab18..53c64f6f 100644
--- a/theforeman.org/yaml/jobs/pipeline/pulpcore-release-pipelines.yaml
+++ b/theforeman.org/yaml/jobs/pipeline/pulpcore-release-pipelines.yaml
@@ -16,9 +16,17 @@
         - 'pipelines/lib/foreman_infra.groovy{empty}'
 
 - project:
-    name: pulpcore
+    name: pulpcore-koji
     jobs:
       - 'pulpcore-{version}-rpm-pipeline'
     empty: ''
     version:
-      !include: ../../includes/pulpcore_versions.yaml.inc
+      !include: ../../includes/pulpcore_versions_koji.yaml.inc
+
+- project:
+    name: pulpcore-copr
+    jobs:
+      - 'pulpcore-{version}-rpm-pipeline'
+    empty: ''
+    version:
+      !include: ../../includes/pulpcore_versions_copr.yaml.inc
diff --git a/theforeman.org/yaml/jobs/release/pulpcore-packaging-rpm-release.yaml b/theforeman.org/yaml/jobs/release/pulpcore-packaging-rpm-release.yaml
index 3c29cbfc..a20812dd 100644
--- a/theforeman.org/yaml/jobs/release/pulpcore-packaging-rpm-release.yaml
+++ b/theforeman.org/yaml/jobs/release/pulpcore-packaging-rpm-release.yaml
@@ -20,12 +20,20 @@
         - 'pipelines/lib/foreman_infra.groovy{empty}'
 
 - project:
-    name: pulpcore-packaging
+    name: pulpcore-packaging-rpm-koji
     jobs:
       - 'pulpcore-packaging-rpm-{version}-release'
     empty: ''
     version:
-      !include: ../../includes/pulpcore_versions.yaml.inc
+      !include: ../../includes/pulpcore_versions_koji.yaml.inc
+
+- project:
+    name: pulpcore-packaging-rpm-copr
+    jobs:
+      - 'pulpcore-packaging-rpm-copr-{version}-release'
+    empty: ''
+    version:
+      !include: ../../includes/pulpcore_versions_copr.yaml.inc
 
 - job-template:
     name: 'pulpcore-packaging-rpm-copr-{version}-release'
@@ -46,11 +54,3 @@
         - 'pipelines/lib/obal.groovy{empty}'
         - 'pipelines/lib/packaging.groovy{empty}'
         - 'pipelines/lib/foreman_infra.groovy{empty}'
-
-- project:
-    name: pulpcore-packaging-rpm-copr-nightly
-    jobs:
-      - 'pulpcore-packaging-rpm-copr-{version}-release'
-    empty: ''
-    version:
-      - 'nightly'