From 317f863216cbafaca85206a19dde693fc95cf34d Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 2 May 2024 10:30:18 +0200
Subject: [PATCH 1/2] drop push_(foreman|katello|pulpcore)_rpms, they are
 unused

---
 theforeman.org/pipelines/lib/release.groovy | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/theforeman.org/pipelines/lib/release.groovy b/theforeman.org/pipelines/lib/release.groovy
index b75d7881..e6ae09d7 100644
--- a/theforeman.org/pipelines/lib/release.groovy
+++ b/theforeman.org/pipelines/lib/release.groovy
@@ -1,8 +1,3 @@
-void push_foreman_rpms(repo_type, version, distro) {
-    version = version == 'develop' ? 'nightly' : version
-    push_rpms("foreman-${repo_type}-${version}", repo_type, version, distro)
-}
-
 void push_rpms(repo_src, repo_dest, version, distro, keep_old_files = false, staging = false) {
     push_rpms_direct("${repo_src}/${distro}", "${repo_dest}/${version}/${distro}", !keep_old_files, keep_old_files, staging)
 }
@@ -19,16 +14,6 @@ void push_debs_direct(os, repo) {
     }
 }
 
-void push_pulpcore_rpms(version, distro) {
-    push_rpms("pulpcore-${version}", "pulpcore", version, distro, true)
-}
-
-void push_katello_rpms(version, distro) {
-    keep_old = version != 'nightly'
-    push_rpms_direct("katello-${version}/katello/${distro}", "katello/${version}/katello/${distro}", !keep_old, keep_old)
-    push_rpms_direct("katello-${version}/candlepin/${distro}", "katello/${version}/candlepin/${distro}", !keep_old, keep_old)
-}
-
 void push_staging_rpms(repo_src, repo_dest, version, distro, keep_old_files = false) {
     if (repo_dest == 'foreman') {
         destination = "releases/${version}/${distro}"

From 576898df9ac4e85294c2f3e0355435ded2204ad8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 2 May 2024 10:31:26 +0200
Subject: [PATCH 2/2] drop staging parameter from push_* methods

we only support pushing to staging now
---
 theforeman.org/pipelines/lib/release.groovy | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/theforeman.org/pipelines/lib/release.groovy b/theforeman.org/pipelines/lib/release.groovy
index e6ae09d7..00ce56b0 100644
--- a/theforeman.org/pipelines/lib/release.groovy
+++ b/theforeman.org/pipelines/lib/release.groovy
@@ -1,10 +1,10 @@
-void push_rpms(repo_src, repo_dest, version, distro, keep_old_files = false, staging = false) {
-    push_rpms_direct("${repo_src}/${distro}", "${repo_dest}/${version}/${distro}", !keep_old_files, keep_old_files, staging)
+void push_rpms(repo_src, repo_dest, version, distro, keep_old_files = false) {
+    push_rpms_direct("${repo_src}/${distro}", "${repo_dest}/${version}/${distro}", !keep_old_files, keep_old_files)
 }
 
-void push_rpms_direct(repo_source, repo_dest, overwrite = true, merge = false, staging = false) {
+void push_rpms_direct(repo_source, repo_dest, overwrite = true, merge = false) {
     sshagent(['repo-sync']) {
-        sh "ssh yumrepo@web01.osuosl.theforeman.org ${repo_source} ${repo_dest} ${overwrite} ${merge} ${staging}"
+        sh "ssh yumrepo@web01.osuosl.theforeman.org ${repo_source} ${repo_dest} ${overwrite} ${merge}"
     }
 }
 
@@ -23,7 +23,7 @@ void push_staging_rpms(repo_src, repo_dest, version, distro, keep_old_files = fa
         destination = "${repo_dest}/${version}/${distro}"
     }
 
-    push_rpms_direct("${repo_src}/${distro}", destination, !keep_old_files, keep_old_files, true)
+    push_rpms_direct("${repo_src}/${distro}", destination, !keep_old_files, keep_old_files)
 }
 
 void push_foreman_staging_rpms(repo_type, version, distro) {