Skip to content

Commit

Permalink
Remove 'staging' stage in various pipelines
Browse files Browse the repository at this point in the history 
Candlepin doesn't have this and it works there. This makes it easier to
read.
  • Loading branch information
@ekohl
ekohl committed Jun 3, 2024
1 parent ce8d2b5 commit baf3a59
Show file tree
Hide file tree
Showing 5 changed files with 224 additions and 250 deletions.
95 changes: 45 additions & 50 deletions theforeman.org/pipelines/release/pipelines/client.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent none
agent { label 'el8' }

options {
timestamps()
Expand All @@ -9,63 +9,58 @@ pipeline {
}

stages {
stage('staging') {
agent { label 'el8' }
stages {
stage('staging-build-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false
stage('staging-build-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false

script {
foreman_client_distros.each { distro ->
sh "./build_stage_repository client ${foreman_version} ${distro}"
}
}
script {
foreman_client_distros.each { distro ->
sh "./build_stage_repository client ${foreman_version} ${distro}"
}
}
stage('staging-copy-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('client', foreman_version)
}
}
}
}
stage('staging-copy-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('client', foreman_version)
}
stage('staging-repoclosure') {
steps {
script {
def parallelStagesMap = [:]
def name = 'foreman-client-staging'
foreman_client_distros.each { distro ->
if (distro.startsWith('el')) {
parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
} else if (distro.startsWith('fc')) {
parallelStagesMap[distro] = { repoclosure(name, distro.replace('fc', 'f'), foreman_version) }
}
}
parallel parallelStagesMap
}
}
post {
always {
deleteDir()
}
}
stage('staging-repoclosure') {
steps {
script {
def parallelStagesMap = [:]
def name = 'foreman-client-staging'
foreman_client_distros.each { distro ->
if (distro.startsWith('el')) {
parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
} else if (distro.startsWith('fc')) {
parallelStagesMap[distro] = { repoclosure(name, distro.replace('fc', 'f'), foreman_version) }
}
}
parallel parallelStagesMap
}
stage('staging-push-rpms') {
agent { label 'sshkey' }
}
post {
always {
deleteDir()
}
}
}
stage('staging-push-rpms') {
agent { label 'sshkey' }

steps {
script {
foreman_client_distros.each { distro ->
push_foreman_staging_rpms('client', foreman_version, distro)
}
}
steps {
script {
foreman_client_distros.each { distro ->
push_foreman_staging_rpms('client', foreman_version, distro)
}
}
}
Expand Down
95 changes: 45 additions & 50 deletions theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent none
agent { label 'el8' }

options {
timestamps()
Expand All @@ -9,63 +9,58 @@ pipeline {
}

stages {
stage('staging') {
agent { label 'el8' }
stages {
stage('staging-build-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false
stage('staging-build-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false

script {
foreman_el_releases.each { distro ->
sh "./build_stage_repository foreman ${foreman_version} ${distro}"
}
}
script {
foreman_el_releases.each { distro ->
sh "./build_stage_repository foreman ${foreman_version} ${distro}"
}
}
stage('staging-copy-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('foreman', foreman_version)
}
}
}
}
stage('staging-copy-repository') {
when {
expression { foreman_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('foreman', foreman_version)
}
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('foreman-staging', foreman_el_releases, foreman_version)
}
}
post {
always {
deleteDir()
}
}
}
}
stage('staging-repoclosure') {
steps {
script {
parallel repoclosures('foreman-staging', foreman_el_releases, foreman_version)
}
stage('staging-install-test') {
agent any
}
post {
always {
deleteDir()
}
}
}
stage('staging-install-test') {
agent any

steps {
script {
runDuffyPipeline('foreman-rpm', foreman_version)
}
}
steps {
script {
runDuffyPipeline('foreman-rpm', foreman_version)
}
stage('staging-push-rpms') {
agent { label 'sshkey' }
}
}
stage('staging-push-rpms') {
agent { label 'sshkey' }

steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('foreman', foreman_version, distro)
}
}
steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('foreman', foreman_version, distro)
}
}
}
Expand Down
103 changes: 49 additions & 54 deletions theforeman.org/pipelines/release/pipelines/katello.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent none
agent { label 'el8' }

options {
timestamps()
Expand All @@ -9,68 +9,63 @@ pipeline {
}

stages {
stage('staging') {
agent { label 'el8' }
stages {
stage('staging-build-repository') {
when {
expression { katello_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false
stage('staging-build-repository') {
when {
expression { katello_version == 'nightly' }
}
steps {
git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false

script {
foreman_el_releases.each { distro ->
sh "./build_stage_repository katello ${katello_version} ${distro} ${foreman_version}"
}
}
script {
foreman_el_releases.each { distro ->
sh "./build_stage_repository katello ${katello_version} ${distro} ${foreman_version}"
}
}
stage('staging-copy-repository') {
when {
expression { katello_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('katello', katello_version)
}
}
}
}
stage('staging-copy-repository') {
when {
expression { katello_version == 'nightly' }
}
steps {
script {
rsync_to_yum_stage('katello', katello_version)
}
stage('staging-repoclosure') {
steps {
script {
def parallelStagesMap = [:]
def name = 'katello-staging'
foreman_el_releases.each { distro ->
parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
}
parallel parallelStagesMap
}
}
post {
always {
deleteDir()
}
}
}
stage('staging-repoclosure') {
steps {
script {
def parallelStagesMap = [:]
def name = 'katello-staging'
foreman_el_releases.each { distro ->
parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) }
}
parallel parallelStagesMap
}
}
post {
always {
deleteDir()
}
stage('staging-install-test') {
agent any
}
}
stage('staging-install-test') {
agent any

steps {
script {
runDuffyPipeline('katello-rpm', katello_version)
}
}
steps {
script {
runDuffyPipeline('katello-rpm', katello_version)
}
stage('staging-push-rpms') {
agent { label 'sshkey' }
}
}
stage('staging-push-rpms') {
agent { label 'sshkey' }

steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('katello', katello_version, distro)
}
}
steps {
script {
foreman_el_releases.each { distro ->
push_foreman_staging_rpms('katello', katello_version, distro)
}
}
}
Expand Down
Loading

0 comments on commit baf3a59

Please sign in to comment.