Skip to content

Commit

Permalink
Further use environment variables to align RPM pipelines
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@ekohl
ekohl committed Jun 4, 2024
1 parent 9892fd5 commit 05e3962
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions theforeman.org/pipelines/release/pipelines/candlepin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pipeline {
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('candlepin', candlepin_distros, candlepin_version)
parallel repoclosures(env.PROJECT, candlepin_distros, env.VERSION)
}
}
post {
Expand All @@ -44,7 +44,7 @@ pipeline {

steps {
script {
runDuffyPipeline('candlepin-rpm', candlepin_version)
runDuffyPipeline("${env.PROJECT}-rpm", env.VERSION)
}
}
}
Expand All @@ -54,15 +54,15 @@ pipeline {
steps {
script {
candlepin_distros.each { distro ->
push_foreman_staging_rpms('candlepin', candlepin_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
}
}
post {
failure {
notifyDiscourse(env, "Candlepin ${candlepin_version} RPM pipeline failed:", currentBuild.description)
notifyDiscourse(env, "${env.PROJECT} ${env.VERSION} RPM pipeline failed:", currentBuild.description)
}
}
}
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/client.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pipeline {
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('foreman-client-staging', foreman_client_distros, foreman_version)
parallel repoclosures("foreman-${env.PROJECT}-staging", foreman_client_distros, env.VERSION)
}
}
post {
Expand All @@ -45,7 +45,7 @@ pipeline {
steps {
script {
foreman_client_distros.each { distro ->
push_foreman_staging_rpms('client', foreman_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pipeline {
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('foreman-staging', foreman_el_releases, foreman_version)
parallel repoclosures("${env.PROJECT}-staging", foreman_el_releases, env.VERSION)
}
}
post {
Expand All @@ -44,7 +44,7 @@ pipeline {

steps {
script {
runDuffyPipeline('foreman-rpm', foreman_version)
runDuffyPipeline("${env.PROJECT}-rpm", env.VERSION)
}
}
}
Expand All @@ -54,15 +54,15 @@ pipeline {
steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('foreman', foreman_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
}
}
post {
failure {
notifyDiscourse(env, 'Foreman RPM nightly pipeline failed:', currentBuild.description)
notifyDiscourse(env, "${env.PROJECT} ${env.VERSION} RPM pipeline failed:", currentBuild.description)
}
}
}
6 changes: 3 additions & 3 deletions theforeman.org/pipelines/release/pipelines/katello.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pipeline {

steps {
script {
runDuffyPipeline('katello-rpm', katello_version)
runDuffyPipeline("${env.PROJECT}-rpm", env.VERSION)
}
}
}
Expand All @@ -54,15 +54,15 @@ pipeline {
steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('katello', katello_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
}
}
post {
failure {
notifyDiscourse(env, "Katello ${katello_version} pipeline failed:", currentBuild.description)
notifyDiscourse(env, "${env.PROJECT} ${env.VERSION} RPM pipeline failed:", currentBuild.description)
}
}
}
6 changes: 3 additions & 3 deletions theforeman.org/pipelines/release/pipelines/plugins.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('plugins-staging', foreman_el_releases, foreman_version)
parallel repoclosures("${env.PROJECT}-staging", foreman_el_releases, env.VERSION)
}
}
post {
Expand All @@ -42,15 +42,15 @@ pipeline {
steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('plugins', foreman_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
}
}
post {
failure {
notifyDiscourse(env, "Plugins ${foreman_version} pipeline failed:", currentBuild.description)
notifyDiscourse(env, "${env.PROJECT} ${env.VERSION} RPM pipeline failed:", currentBuild.description)
}
}
}
8 changes: 4 additions & 4 deletions theforeman.org/pipelines/release/pipelines/pulpcore.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pipeline {
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('pulpcore-staging', foreman_el_releases, foreman_version)
parallel repoclosures("${env.PROJECT}-staging", pulpcore_distros, env.VERSION)
}
}
post {
Expand All @@ -44,7 +44,7 @@ pipeline {

steps {
script {
runDuffyPipeline('pulpcore-rpm', pulpcore_version)
runDuffyPipeline("${env.PROJECT}-rpm", env.VERSION)
}
}
}
Expand All @@ -54,15 +54,15 @@ pipeline {
steps {
script {
pulpcore_distros.each { distro ->
push_foreman_staging_rpms('pulpcore', pulpcore_version, distro)
push_foreman_staging_rpms(env.PROJECT, env.VERSION, distro)
}
}
}
}
}
post {
failure {
notifyDiscourse(env, "Pulpcore ${pulpcore_version} RPM pipeline failed:", currentBuild.description)
notifyDiscourse(env, "${env.PROJECT} ${env.VERSION} RPM pipeline failed:", currentBuild.description)
}
}
}

0 comments on commit 05e3962

Please sign in to comment.