Skip to content

Commit

Permalink
drop admin label from agent selection
Browse files Browse the repository at this point in the history
we only use it together with the sshkey label, so the later is
sufficient
  • Loading branch information
evgeni authored and ekohl committed Feb 27, 2024
1 parent cfbcf83 commit 3dcc6ba
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion theforeman.org/pipelines/deploy/puppet.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

options {
ansiColor('xterm')
Expand Down
2 changes: 1 addition & 1 deletion theforeman.org/pipelines/deploy/website.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

options {
ansiColor('xterm')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

options {
timestamps()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/client.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pipeline {
}
}
stage('koji-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down Expand Up @@ -111,7 +111,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pipeline {
}
}
stage('Push Koji RPMs') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

when {
expression { stage_source == 'koji' }
Expand All @@ -83,7 +83,7 @@ pipeline {
}

stage('Push Staging RPMs') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

when {
expression { stage_source == 'stagingyum' }
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pipeline {
}
}
stage('koji-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }
steps {
script {
for (release in foreman_el_releases) {
Expand Down Expand Up @@ -110,7 +110,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/katello.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pipeline {
}
}
stage('koji-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down Expand Up @@ -116,7 +116,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/plugins.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pipeline {
}
}
stage('koji-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down Expand Up @@ -94,7 +94,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/release/pipelines/pulpcore.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pipeline {
}
}
stage('koji-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down Expand Up @@ -127,7 +127,7 @@ pipeline {
}
}
stage('staging-push-rpms') {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

steps {
script {
Expand Down
2 changes: 1 addition & 1 deletion theforeman.org/pipelines/release/tarballsRelease.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'admin && sshkey' }
agent { label 'sshkey' }

options {
timestamps()
Expand Down

0 comments on commit 3dcc6ba

Please sign in to comment.