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.
theforeman · Nov 16, 2023 · a847a12 · a847a12
1 parent ffe326a
commit a847a12
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git 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
@@ -0,0 +1 @@
+- 'nightly'
diff --git a/.../yaml/includes/pulpcore_versions.yaml.inc → .../includes/pulpcore_versions_koji.yaml.inc b/.../yaml/includes/pulpcore_versions.yaml.inc → .../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
@@ -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
@@ -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'
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,3 @@ @@
     - '3.21'
     - '3.22'
     - '3.28'
-    - 'nightly'