Align RPM pipelines' groovy code #458
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 3, 2024
Rather than relying on Puppet to deploy an SSH key, this stores a key in Jenkins and then uses an SSH-agent to provide access.
This creates a single stage to both build and push staging RPMs by using the generate_stage_repository script from theforeman-rel-eng. It uses environment variables to configure things, which further removes unique configuration from individual pipeline steps.
This unifies RPM pipelines further by using environment variables that are already available. It makes some changes to Discourse to align them, other than that there should be no practical difference here.
ekohl
force-pushed
the
align-rpm-pipelines
branch
from
f0fcdc7
to
05e3962
Compare
ekohl
commented
Jun 4, 2024
| export PROJECT=${collection} | ||
| ./upload_stage_rpms | ||
| """ | ||
| sshagent(['yum-stage']) { |
There was a problem hiding this comment.
This will need some manual migration, but allows us to drop this bit:
https://github.com/theforeman/foreman-infra/blob/801376af314f44108b4a851edc9e2d2173f7c247/puppet/modules/jenkins_node/manifests/packaging/rpm.pp#L44-L48
ekohl
commented
Jun 4, 2024
Comment on lines
+15
to
+17
| script { | ||
| env.VERSION = candlepin_version | ||
| } |
There was a problem hiding this comment.
I can't find a good way to set the environment variable as a script. Perhaps this needs to be
Suggested change
| script { | |
| env.VERSION = candlepin_version | |
| } | |
| env.VERSION = candlepin_version |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This attempts to align the code as much as possible. See individual commits for details.
My goal would be to create some common library function that generates the whole pipeline with some parameters so we don't need to copy things.
Big differences remaining:
Currently very much untested and the SSH key needs some manual work to be created with some clean up in foreman-infra as well.