Use upload_stage_rpms to rsync to stagingyum

theforeman · Nov 1, 2023 · de16585 · de16585
1 parent 6565a8d
commit de16585
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/theforeman.org/pipelines/lib/packaging.groovy b/theforeman.org/pipelines/lib/packaging.groovy
@@ -479,7 +479,9 @@ def rsync_yum(user, ssh_key, collection, target, version) {
 
         sh """
             export RSYNC_RSH="ssh -i ${ssh_key}"
-            /usr/bin/rsync --archive --verbose --partial --one-file-system --delete-after ${collection}/${version} ${target_path}
+            export VERSION=${version}
+            export PROJECT=${collection}
+            ./upload_stage_rpms
         """
     }
 }
diff --git a/theforeman.org/pipelines/release/pipelines/client.groovy b/theforeman.org/pipelines/release/pipelines/client.groovy
@@ -77,9 +77,7 @@ pipeline {
                 stage('staging-copy-repository') {
                     steps {
                         script {
-                            dir('tmp') {
-                                rsync_to_yum_stage('client', 'client', foreman_version)
-                            }
+                            rsync_to_yum_stage('client', 'client', foreman_version)
                         }
                     }
                 }

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

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