Use upload_stage_rpms to rsync to stagingyum

theforeman · Mar 25, 2024 · acec1c8 · acec1c8
1 parent 8d73ce8
commit acec1c8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 33 deletions.
diff --git a/theforeman.org/pipelines/lib/packaging.groovy b/theforeman.org/pipelines/lib/packaging.groovy
@@ -481,22 +481,17 @@ def rsync_debian(user, ssh_key, suite, component, deb_paths) {
     }
 }
 
-def rsync_to_yum_stage(collection, target, version) {
-    def user = 'yumrepostage'
+def rsync_to_yum_stage(collection, version) {
     def ssh_key = '/home/jenkins/workspace/staging_key/rsync_yumrepostage_key'
 
-    rsync_yum(user, ssh_key, collection, target, version)
-}
-
-def rsync_yum(user, ssh_key, collection, target, version) {
-    def hosts = ["web01.osuosl.theforeman.org"]
-
-    for(host in hosts) {
-        def target_path = "${user}@${host}:rsync_cache/${target}/${version}/"
-
-        sh """
-            export RSYNC_RSH="ssh -i ${ssh_key}"
-            /usr/bin/rsync --checksum --times --perms --recursive --links --verbose --partial --one-file-system --delete-after ${collection}/${version}/ ${target_path}
-        """
+    if (!fileExists('upload_stage_rpms')) {
+        git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false
     }
+
+    sh """
+        export RSYNC_RSH="ssh -i ${ssh_key}"
+        export VERSION=${version}
+        export PROJECT=${collection}
+        ./upload_stage_rpms
+    """
 }
diff --git a/theforeman.org/pipelines/release/pipelines/candlepin.groovy b/theforeman.org/pipelines/release/pipelines/candlepin.groovy
@@ -29,9 +29,7 @@ pipeline {
             }
             steps {
                 script {
-                    dir('tmp') {
-                        rsync_to_yum_stage('candlepin', 'candlepin', candlepin_version)
-                    }
+                    rsync_to_yum_stage('candlepin', candlepin_version)
                 }
             }
         }

diff --git a/theforeman.org/pipelines/release/pipelines/client.groovy b/theforeman.org/pipelines/release/pipelines/client.groovy
@@ -32,9 +32,7 @@ pipeline {
                     }
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('client', 'client', foreman_version)
-                            }
+                            rsync_to_yum_stage('client', foreman_version)
                         }
                     }
                 }

diff --git a/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy b/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy
@@ -32,9 +32,7 @@ pipeline {
                     }
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('foreman', 'foreman', foreman_version)
-                            }
+                            rsync_to_yum_stage('foreman', foreman_version)
                         }
                     }
                 }

diff --git a/theforeman.org/pipelines/release/pipelines/katello.groovy b/theforeman.org/pipelines/release/pipelines/katello.groovy
@@ -32,9 +32,7 @@ pipeline {
                     }
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('katello', 'katello', katello_version)
-                            }
+                            rsync_to_yum_stage('katello', katello_version)
                         }
                     }
                 }

diff --git a/theforeman.org/pipelines/release/pipelines/plugins.groovy b/theforeman.org/pipelines/release/pipelines/plugins.groovy
@@ -26,9 +26,7 @@ pipeline {
                 stage('staging-copy-repository') {
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('plugins', 'plugins', foreman_version)
-                            }
+                            rsync_to_yum_stage('plugins', foreman_version)
                         }
                     }
                 }

diff --git a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy
@@ -33,9 +33,7 @@ pipeline {
                     }
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('pulpcore', 'pulpcore', pulpcore_version)
-                            }
+                            rsync_to_yum_stage('pulpcore', pulpcore_version)
                         }
                     }
                 }