From b60c1264564647955fdc6d24773f8f2647c8ea73 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 May 2024 22:22:27 +0200
Subject: [PATCH] Align pipelines on repoclosures() function

For client it still had Fedora compatiblity code, but that has been
dropped in Foreman 3.1 so no longer relevant.
---
 .../pipelines/release/pipelines/client.groovy         | 11 +----------
 .../pipelines/release/pipelines/katello.groovy        |  7 +------
 .../pipelines/release/pipelines/plugins.groovy        |  7 +------
 .../pipelines/release/pipelines/pulpcore.groovy       |  7 +------
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/theforeman.org/pipelines/release/pipelines/client.groovy b/theforeman.org/pipelines/release/pipelines/client.groovy
index bc435706..5d5d9e3d 100644
--- a/theforeman.org/pipelines/release/pipelines/client.groovy
+++ b/theforeman.org/pipelines/release/pipelines/client.groovy
@@ -36,16 +36,7 @@ pipeline {
         stage('staging-repoclosure') {
             steps {
                 script {
-                    def parallelStagesMap = [:]
-                    def name = 'foreman-client-staging'
-                    foreman_client_distros.each { distro ->
-                        if (distro.startsWith('el')) {
-                            parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
-                        } else if (distro.startsWith('fc')) {
-                            parallelStagesMap[distro] = { repoclosure(name, distro.replace('fc', 'f'), foreman_version) }
-                        }
-                    }
-                    parallel parallelStagesMap
+                    parallel repoclosures('foreman-client-staging', foreman_client_distros, foreman_version)
                 }
             }
             post {
diff --git a/theforeman.org/pipelines/release/pipelines/katello.groovy b/theforeman.org/pipelines/release/pipelines/katello.groovy
index 3336322d..4e4bc07b 100644
--- a/theforeman.org/pipelines/release/pipelines/katello.groovy
+++ b/theforeman.org/pipelines/release/pipelines/katello.groovy
@@ -36,12 +36,7 @@ pipeline {
         stage('staging-repoclosure') {
             steps {
                 script {
-                    def parallelStagesMap = [:]
-                    def name = 'katello-staging'
-                    foreman_el_releases.each { distro ->
-                        parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
-                    }
-                    parallel parallelStagesMap
+                    parallel repoclosures('katello-staging', foreman_el_releases, foreman_version)
                 }
             }
             post {
diff --git a/theforeman.org/pipelines/release/pipelines/plugins.groovy b/theforeman.org/pipelines/release/pipelines/plugins.groovy
index e3a97991..eec3099a 100644
--- a/theforeman.org/pipelines/release/pipelines/plugins.groovy
+++ b/theforeman.org/pipelines/release/pipelines/plugins.groovy
@@ -30,12 +30,7 @@ pipeline {
         stage('staging-repoclosure') {
             steps {
                 script {
-                    def parallelStagesMap = [:]
-                    def name = 'plugins-staging'
-                    foreman_el_releases.each { distro ->
-                        parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
-                    }
-                    parallel parallelStagesMap
+                    parallel repoclosures('plugins-staging', foreman_el_releases, foreman_version)
                 }
             }
             post {
diff --git a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy
index 16e6de80..0112c58e 100644
--- a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy
+++ b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy
@@ -36,12 +36,7 @@ pipeline {
         stage('staging-repoclosure') {
             steps {
                 script {
-                    def parallelStagesMap = [:]
-                    def name = 'pulpcore-staging'
-                    pulpcore_distros.each { distro ->
-                        parallelStagesMap[distro] = { repoclosure(name, distro, pulpcore_version) }
-                    }
-                    parallel parallelStagesMap
+                    parallel repoclosures('pulpcore-staging', foreman_el_releases, foreman_version)
                 }
             }
             post {