From 3dcc6bafeb4a7e5029b92b94ebbad71fdbc76960 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 27 Feb 2024 11:51:30 +0100 Subject: [PATCH] drop admin label from agent selection we only use it together with the sshkey label, so the later is sufficient --- theforeman.org/pipelines/deploy/puppet.groovy | 2 +- theforeman.org/pipelines/deploy/website.groovy | 2 +- .../pipelines/release/foreman-discovery-image.groovy | 2 +- theforeman.org/pipelines/release/pipelines/candlepin.groovy | 2 +- theforeman.org/pipelines/release/pipelines/client.groovy | 4 ++-- .../pipelines/release/pipelines/foreman-pipeline.groovy | 4 ++-- theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy | 4 ++-- theforeman.org/pipelines/release/pipelines/katello.groovy | 4 ++-- theforeman.org/pipelines/release/pipelines/plugins.groovy | 4 ++-- theforeman.org/pipelines/release/pipelines/pulpcore.groovy | 4 ++-- theforeman.org/pipelines/release/tarballsRelease.groovy | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/theforeman.org/pipelines/deploy/puppet.groovy b/theforeman.org/pipelines/deploy/puppet.groovy index 15faf9a5..7dae1cc2 100644 --- a/theforeman.org/pipelines/deploy/puppet.groovy +++ b/theforeman.org/pipelines/deploy/puppet.groovy @@ -1,5 +1,5 @@ pipeline { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } options { ansiColor('xterm') diff --git a/theforeman.org/pipelines/deploy/website.groovy b/theforeman.org/pipelines/deploy/website.groovy index 6afe6bc1..6311a456 100644 --- a/theforeman.org/pipelines/deploy/website.groovy +++ b/theforeman.org/pipelines/deploy/website.groovy @@ -1,5 +1,5 @@ pipeline { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } options { ansiColor('xterm') diff --git a/theforeman.org/pipelines/release/foreman-discovery-image.groovy b/theforeman.org/pipelines/release/foreman-discovery-image.groovy index 240df31c..9d89eaa4 100644 --- a/theforeman.org/pipelines/release/foreman-discovery-image.groovy +++ b/theforeman.org/pipelines/release/foreman-discovery-image.groovy @@ -1,5 +1,5 @@ pipeline { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } options { timestamps() diff --git a/theforeman.org/pipelines/release/pipelines/candlepin.groovy b/theforeman.org/pipelines/release/pipelines/candlepin.groovy index 91a6c118..56c87f89 100644 --- a/theforeman.org/pipelines/release/pipelines/candlepin.groovy +++ b/theforeman.org/pipelines/release/pipelines/candlepin.groovy @@ -57,7 +57,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/pipelines/client.groovy b/theforeman.org/pipelines/release/pipelines/client.groovy index 7bf065a9..62afb67e 100644 --- a/theforeman.org/pipelines/release/pipelines/client.groovy +++ b/theforeman.org/pipelines/release/pipelines/client.groovy @@ -45,7 +45,7 @@ pipeline { } } stage('koji-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { @@ -111,7 +111,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/pipelines/foreman-pipeline.groovy b/theforeman.org/pipelines/release/pipelines/foreman-pipeline.groovy index c3f070d9..6fd814bf 100644 --- a/theforeman.org/pipelines/release/pipelines/foreman-pipeline.groovy +++ b/theforeman.org/pipelines/release/pipelines/foreman-pipeline.groovy @@ -67,7 +67,7 @@ pipeline { } } stage('Push Koji RPMs') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } when { expression { stage_source == 'koji' } @@ -83,7 +83,7 @@ pipeline { } stage('Push Staging RPMs') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } when { expression { stage_source == 'stagingyum' } diff --git a/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy b/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy index efab3a60..6c3f1383 100644 --- a/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy +++ b/theforeman.org/pipelines/release/pipelines/foreman-rpm.groovy @@ -45,7 +45,7 @@ pipeline { } } stage('koji-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { for (release in foreman_el_releases) { @@ -110,7 +110,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/pipelines/katello.groovy b/theforeman.org/pipelines/release/pipelines/katello.groovy index 0b6ce1a9..039e89dc 100644 --- a/theforeman.org/pipelines/release/pipelines/katello.groovy +++ b/theforeman.org/pipelines/release/pipelines/katello.groovy @@ -45,7 +45,7 @@ pipeline { } } stage('koji-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { @@ -116,7 +116,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/pipelines/plugins.groovy b/theforeman.org/pipelines/release/pipelines/plugins.groovy index 6ecbbf93..e9b6ed74 100644 --- a/theforeman.org/pipelines/release/pipelines/plugins.groovy +++ b/theforeman.org/pipelines/release/pipelines/plugins.groovy @@ -36,7 +36,7 @@ pipeline { } } stage('koji-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { @@ -94,7 +94,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy index fc1ccdd6..6be962a4 100644 --- a/theforeman.org/pipelines/release/pipelines/pulpcore.groovy +++ b/theforeman.org/pipelines/release/pipelines/pulpcore.groovy @@ -51,7 +51,7 @@ pipeline { } } stage('koji-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { @@ -127,7 +127,7 @@ pipeline { } } stage('staging-push-rpms') { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } steps { script { diff --git a/theforeman.org/pipelines/release/tarballsRelease.groovy b/theforeman.org/pipelines/release/tarballsRelease.groovy index f72c23b8..c141b55e 100644 --- a/theforeman.org/pipelines/release/tarballsRelease.groovy +++ b/theforeman.org/pipelines/release/tarballsRelease.groovy @@ -1,5 +1,5 @@ pipeline { - agent { label 'admin && sshkey' } + agent { label 'sshkey' } options { timestamps()