rm usage of 'jenkins-master' node label

lsst-dm · Jun 20, 2019 · 4f13a86 · 4f13a86
1 parent e3dcbfd
commit 4f13a86
Show file tree

Hide file tree

Showing 63 changed files with 62 additions and 64 deletions.
diff --git a/jobs/node_cleanup.groovy b/jobs/node_cleanup.groovy
@@ -7,8 +7,6 @@ job('sqre/infra/jenkins-node-cleanup') {
     booleanParam('FORCE_CLEANUP', false, 'Force cleanup of node workspace(s) regardless of free space remaining threshold. Note that the workspace of active jobs *will not* be cleaned up.')
   }
 
-  // don't tie up a beefy build slave
-  label('jenkins-master')
   concurrentBuild(false)
 
   triggers {

diff --git a/pipelines/dax/docker/build_dev.groovy b/pipelines/dax/docker/build_dev.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/dax/docker/build_imgserv.groovy b/pipelines/dax/docker/build_imgserv.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/dax/release/rebuild_publish_qserv_dev.groovy b/pipelines/dax/release/rebuild_publish_qserv_dev.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/lib/util.groovy b/pipelines/lib/util.groovy
@@ -897,7 +897,7 @@ def void withGithubAdminCredentials(Closure run) {
  * @param run Closure Invoked inside of node step
  */
 def void nodeTiny(Closure run) {
-  node('jenkins-master') {
+  node {
     timeout(time: 5, unit: 'MINUTES') {
       run()
     }

diff --git a/pipelines/release/build_publish.groovy b/pipelines/release/build_publish.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/codekit/github_get_ratelimit.groovy b/pipelines/release/codekit/github_get_ratelimit.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/codekit/github_tag_release.groovy b/pipelines/release/codekit/github_tag_release.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/codekit/github_tag_teams.groovy b/pipelines/release/codekit/github_tag_teams.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/docker/build_stack.groovy b/pipelines/release/docker/build_stack.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/nightly_release.groovy b/pipelines/release/nightly_release.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/nightly_release_cron.groovy b/pipelines/release/nightly_release_cron.groovy
@@ -1,7 +1,7 @@
 import java.time.LocalDate
 import java.time.ZoneId
 
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/official_release.groovy b/pipelines/release/official_release.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/run_publish.groovy b/pipelines/release/run_publish.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/run_rebuild.groovy b/pipelines/release/run_rebuild.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/tarball.groovy b/pipelines/release/tarball.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   if (params.WIPEOUT) {
     deleteDir()
   }

diff --git a/pipelines/release/tarball_matrix.groovy b/pipelines/release/tarball_matrix.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/weekly_release.groovy b/pipelines/release/weekly_release.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/release/weekly_release_cron.groovy b/pipelines/release/weekly_release_cron.groovy
@@ -2,7 +2,7 @@ import java.time.LocalDate
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/scipipe/ap_verify.groovy b/pipelines/scipipe/ap_verify.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   if (params.WIPEOUT) {
     deleteDir()
   }

diff --git a/pipelines/sims/weekly_release.groovy b/pipelines/sims/weekly_release.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/backup/build_s3backup.groovy b/pipelines/sqre/backup/build_s3backup.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/backup/build_sqre_github_snapshot.groovy b/pipelines/sqre/backup/build_sqre_github_snapshot.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/backup/nightly_sqre_github_snapshot.groovy b/pipelines/sqre/backup/nightly_sqre_github_snapshot.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/backup/s3backup_eups.groovy b/pipelines/sqre/backup/s3backup_eups.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/bench_gitlfs.groovy b/pipelines/sqre/ci_ci/bench_gitlfs.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/ghslacker.groovy b/pipelines/sqre/ci_ci/ghslacker.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_docker_from_arg.groovy b/pipelines/sqre/ci_ci/test_docker_from_arg.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_docker_gitlfs_inside.groovy b/pipelines/sqre/ci_ci/test_docker_gitlfs_inside.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_docker_gitlfs_outside.groovy b/pipelines/sqre/ci_ci/test_docker_gitlfs_outside.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_pipeline.groovy b/pipelines/sqre/ci_ci/test_pipeline.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_pipeline_config_file.groovy b/pipelines/sqre/ci_ci/test_pipeline_config_file.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_pipeline_docker.groovy b/pipelines/sqre/ci_ci/test_pipeline_docker.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/ci_ci/test_pipeline_write.groovy b/pipelines/sqre/ci_ci/test_pipeline_write.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_awscli.groovy b/pipelines/sqre/infra/build_awscli.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_cmirror.groovy b/pipelines/sqre/infra/build_cmirror.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_codekit.groovy b/pipelines/sqre/infra/build_codekit.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_dind.groovy b/pipelines/sqre/infra/build_dind.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_docker_gc.groovy b/pipelines/sqre/infra/build_docker_gc.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_gitlfs.groovy b/pipelines/sqre/infra/build_gitlfs.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_gitlfs_server.groovy b/pipelines/sqre/infra/build_gitlfs_server.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_jenkins_swarm_client.groovy b/pipelines/sqre/infra/build_jenkins_swarm_client.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_layercake.groovy b/pipelines/sqre/infra/build_layercake.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_ltd_mason.groovy b/pipelines/sqre/infra/build_ltd_mason.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_newinstall.groovy b/pipelines/sqre/infra/build_newinstall.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_nginx_ssl_proxy.groovy b/pipelines/sqre/infra/build_nginx_ssl_proxy.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_postqa.groovy b/pipelines/sqre/infra/build_postqa.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_s3cmd.groovy b/pipelines/sqre/infra/build_s3cmd.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_s3sync.groovy b/pipelines/sqre/infra/build_s3sync.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_sciplatlab.groovy b/pipelines/sqre/infra/build_sciplatlab.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_tag_monger.groovy b/pipelines/sqre/infra/build_tag_monger.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/build_wget.groovy b/pipelines/sqre/infra/build_wget.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/documenteer.groovy b/pipelines/sqre/infra/documenteer.groovy
@@ -1,6 +1,6 @@
 import groovy.transform.Field
 
-node('jenkins-master') {
+node {
   if (params.WIPEOUT) {
     deleteDir()
   }

diff --git a/pipelines/sqre/infra/infra_daily.groovy b/pipelines/sqre/infra/infra_daily.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/infra_daily_cron.groovy b/pipelines/sqre/infra/infra_daily_cron.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/infra_monthly.groovy b/pipelines/sqre/infra/infra_monthly.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/infra_monthly_cron.groovy b/pipelines/sqre/infra/infra_monthly_cron.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/infra_weekly.groovy b/pipelines/sqre/infra/infra_weekly.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/infra_weekly_cron.groovy b/pipelines/sqre/infra/infra_weekly_cron.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/tag_monger.groovy b/pipelines/sqre/infra/tag_monger.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/infra/update_cmirror.groovy b/pipelines/sqre/infra/update_cmirror.groovy
@@ -2,7 +2,7 @@ import groovy.transform.Field
 
 @Field String mirrorBaseUrl = 'https://repo.continuum.io/pkgs'
 
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',

diff --git a/pipelines/sqre/validate_drp.groovy b/pipelines/sqre/validate_drp.groovy
@@ -3,7 +3,7 @@
 // squash.  A rename needs to be coordinated with a simultaneous fixing up of
 // the squash database.
 
-node('jenkins-master') {
+node {
   if (params.WIPEOUT) {
     deleteDir()
   }

diff --git a/pipelines/stack_os_matrix.groovy b/pipelines/stack_os_matrix.groovy
@@ -1,4 +1,4 @@
-node('jenkins-master') {
+node {
   dir('jenkins-dm-jobs') {
     checkout([
       $class: 'GitSCM',