Use upload_stage_rpms to rsync to stagingyum #369
Conversation
ehelms
force-pushed
the
use-rsync-script
branch
from
de16585
to
8ca854b
Compare
ehelms
force-pushed
the
use-rsync-script
branch
from
8ca854b
to
2ac6c23
Compare
|
This should be good to go now that the nightly changes were merged to theforeman-rel-eng. I tested this (https://ci.theforeman.org/job/candlepin-nightly-rpm-pipeline/) for Candlepin pipeline. My intent will be to follow this change up with adopting a few other places to use the scripts rather than stand-alone code and centralize the logic into one place. |
|
@ekohl could you take another look? |
| if (!fileExists('upload_stage_rpms')) { | ||
| git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false | ||
| } |
There was a problem hiding this comment.
I know, this is contrary to what Ewoud asked for, but the previous step is always build_stage_repository which comes from the same repo. So I'd argue it's either guaranteed that the repo is already checked out (one could also argue to have a prep step that does only that, for clarity), or whatever is on disk should absolutely not be synced.
There was a problem hiding this comment.
It took me a while to wrap my head around this, so I tried to see what I would do when I wrote this. I came up with #437. I think using environment instead of shell exports is a slightly cleaner way.
I was also tempted to write a function that creates the entire Jenkins stage with just 2 parameters.
In the short term I don't mind merging this if we can answer the ssh_key issue I noted inline. I'd also argue that eventually using the secrets mechanism in Jenkins (grep for sshagent) should be a better way because then we don't rely on Puppet providing the SSH key at some known location on some nodes. Not a blocker per se, but what I kept in mind writing the version I did.
| } | ||
|
|
||
| sh """ | ||
| export RSYNC_RSH="ssh -i ${ssh_key}" |
This will allow us to align on a single method for the way rsync and upload works and the options used and drive it from
theforeman-rel-engrepository for consistency across nightly and releases. See theforeman/theforeman-rel-eng#291 for more details