diff --git a/theforeman.org/pipelines/release/pipelines/client.groovy b/theforeman.org/pipelines/release/pipelines/client.groovy index 6d9adc96..bc435706 100644 --- a/theforeman.org/pipelines/release/pipelines/client.groovy +++ b/theforeman.org/pipelines/release/pipelines/client.groovy @@ -1,5 +1,5 @@ pipeline { - agent none + agent { label 'el8' } options { timestamps() @@ -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) } } } diff --git a/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy b/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy index 62a5194c..0a7e66d6 100644 --- a/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy +++ b/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy @@ -1,5 +1,5 @@ pipeline { - agent none + agent { label 'el8' } options { timestamps() @@ -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) } } } diff --git a/theforeman.org/pipelines/release/pipelines/katello.groovy b/theforeman.org/pipelines/release/pipelines/katello.groovy index 7baf2afe..3336322d 100644 --- a/theforeman.org/pipelines/release/pipelines/katello.groovy +++ b/theforeman.org/pipelines/release/pipelines/katello.groovy @@ -1,5 +1,5 @@ pipeline { - agent none + agent { label 'el8' } options { timestamps() @@ -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) } } } diff --git a/theforeman.org/pipelines/release/pipelines/plugins.groovy b/theforeman.org/pipelines/release/pipelines/plugins.groovy index 191d6ec6..e3a97991 100644 --- a/theforeman.org/pipelines/release/pipelines/plugins.groovy +++ b/theforeman.org/pipelines/release/pipelines/plugins.groovy @@ -1,5 +1,5 @@ pipeline { - agent none + agent { label 'el8' } options { timestamps() @@ -9,53 +9,48 @@ pipeline { } stages { - stage('staging') { - agent { label 'el8' } - stages { - stage('staging-build-repository') { - steps { - git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false + stage('staging-build-repository') { + steps { + git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false - script { - foreman_el_releases.each { distro -> - sh "./build_stage_repository plugins ${foreman_version} ${distro}" - } - } + script { + foreman_el_releases.each { distro -> + sh "./build_stage_repository plugins ${foreman_version} ${distro}" } } - stage('staging-copy-repository') { - steps { - script { - rsync_to_yum_stage('plugins', foreman_version) - } - } + } + } + stage('staging-copy-repository') { + steps { + script { + rsync_to_yum_stage('plugins', foreman_version) } - stage('staging-repoclosure') { - steps { - script { - def parallelStagesMap = [:] - def name = 'plugins-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 = 'plugins-staging' + foreman_el_releases.each { distro -> + parallelStagesMap[distro] = { repoclosure(name, distro, foreman_version) } } + parallel parallelStagesMap + } + } + post { + always { + deleteDir() } - 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('plugins', foreman_version, distro) - } - } + steps { + script { + foreman_el_releases.each { distro -> + push_foreman_staging_rpms('plugins', foreman_version, distro) } } } diff --git a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy index 121416ab..16e6de80 100644 --- a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy +++ b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy @@ -1,5 +1,5 @@ pipeline { - agent none + agent { label 'el8' } options { timestamps() @@ -8,70 +8,64 @@ pipeline { ansiColor('xterm') } - stages { - stage('staging') { - agent { label 'el8' } - stages { - stage('staging-build-repository') { - when { - expression { pulpcore_version == 'nightly' } - } - steps { - git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false + stage('staging-build-repository') { + when { + expression { pulpcore_version == 'nightly' } + } + steps { + git url: "https://github.com/theforeman/theforeman-rel-eng", poll: false - script { - pulpcore_distros.each { distro -> - sh "./build_stage_repository pulpcore ${pulpcore_version} ${distro}" - } - } + script { + pulpcore_distros.each { distro -> + sh "./build_stage_repository pulpcore ${pulpcore_version} ${distro}" } } - stage('staging-copy-repository') { - when { - expression { pulpcore_version == 'nightly' } - } - steps { - script { - rsync_to_yum_stage('pulpcore', pulpcore_version) - } - } + } + } + stage('staging-copy-repository') { + when { + expression { pulpcore_version == 'nightly' } + } + steps { + script { + rsync_to_yum_stage('pulpcore', pulpcore_version) } - stage('staging-repoclosure') { - steps { - script { - def parallelStagesMap = [:] - def name = 'pulpcore-staging' - pulpcore_distros.each { distro -> - parallelStagesMap[distro] = { repoclosure(name, distro, pulpcore_version) } - } - parallel parallelStagesMap - } - } - post { - always { - deleteDir() - } + } + } + stage('staging-repoclosure') { + steps { + script { + def parallelStagesMap = [:] + def name = 'pulpcore-staging' + pulpcore_distros.each { distro -> + parallelStagesMap[distro] = { repoclosure(name, distro, pulpcore_version) } } + parallel parallelStagesMap } - stage('staging-test') { - agent any + } + post { + always { + deleteDir() + } + } + } + stage('staging-test') { + agent any - steps { - script { - runDuffyPipeline('pulpcore-rpm', pulpcore_version) - } - } + steps { + script { + runDuffyPipeline('pulpcore-rpm', pulpcore_version) } - stage('staging-push-rpms') { - agent { label 'sshkey' } + } + } + stage('staging-push-rpms') { + agent { label 'sshkey' } - steps { - script { - pulpcore_distros.each { distro -> - push_foreman_staging_rpms('pulpcore', pulpcore_version, distro) - } - } + steps { + script { + pulpcore_distros.each { distro -> + push_foreman_staging_rpms('pulpcore', pulpcore_version, distro) } } }