From 5512bbf4bd3ee8e421de891e18e31480706fe437 Mon Sep 17 00:00:00 2001 From: James Nord Date: Tue, 10 Mar 2020 09:24:42 +0000 Subject: [PATCH 1/2] Update allowed-labels.properties do not allow a slave label --- src/main/resources/allowed-labels.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/allowed-labels.properties b/src/main/resources/allowed-labels.properties index e80b678d5..f8804e110 100644 --- a/src/main/resources/allowed-labels.properties +++ b/src/main/resources/allowed-labels.properties @@ -74,7 +74,6 @@ scm scm-related security slack -slaves spot spotinst stash From 6c52e321805d4b3e8651a10e1a3d3366e8e8ed5a Mon Sep 17 00:00:00 2001 From: James Nord Date: Tue, 10 Mar 2020 11:04:47 +0000 Subject: [PATCH 2/2] also change existing labels --- .../resources/label-definitions.properties | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/main/resources/label-definitions.properties b/src/main/resources/label-definitions.properties index 2fb59d566..f5bb1ed2a 100644 --- a/src/main/resources/label-definitions.properties +++ b/src/main/resources/label-definitions.properties @@ -6,7 +6,7 @@ active-directory=user AdaptivePlugin=misc buildwrapper all-changes=ui report allure-jenkins-plugin=report -amazon-ecs=cluster slaves +amazon-ecs=cluster agent analysis-collector=maven report analysis-core=maven report AnchorChain=report @@ -53,7 +53,7 @@ aws-sqs=trigger awseb-deployment-plugin=upload post-build azure-batch-parallel=post-build azure-slave-plugin=cluster -azure-vm-agents=cluster slaves +azure-vm-agents=cluster agent backlog=notifier external user upload backup=misc bamboo-notifier=notifier @@ -164,7 +164,7 @@ clearcase-ucm-plugin=scm clearcase=scm clif-performance-testing=builder report misc clone-workspace-scm=scm -cloud-stats=slaves cluster +cloud-stats=agent cluster cloudbees-bitbucket-branch-source=scm cloudbees-disk-usage-simple=report cloudbees-folder=ui misc @@ -192,7 +192,7 @@ codesonar=notifier report post-build devops collabnet=external collapsing-console-sections=ui compact-columns=ui listview-column -compound-slaves=slaves cluster +compound-slaves=agent cluster compress-artifacts=post-build compress-buildlog=misc compuware-scm-downloader=scm @@ -212,7 +212,7 @@ convertigo-mobile-platform=plugin-test builder copr=external copy-data-to-workspace-plugin=buildwrapper copy-project-link=ui -copy-to-slave=slaves notifier buildwrapper +copy-to-slave=agent notifier buildwrapper copyartifact=builder parameter couchdb-statistics=report countjobs-viewstabbar=misc ui @@ -301,13 +301,13 @@ dynamicparameter=parameter dynatrace-dashboard=report ease-plugin=upload easyant=builder -ec2-cloud-axis=slaves cluster +ec2-cloud-axis=agent cluster ec2-deployment-dashboard=misc ui ec2=cluster eclipse-update-site=library ecutest=builder report external eggplant-plugin=builder -elastic-axis=slaves buildwrapper +elastic-axis=agent buildwrapper elasticbox=cluster buildwrapper builder elasticsearch-query=builder elOyente=trigger @@ -323,7 +323,7 @@ envinject=buildwrapper builder environment-manager=deployment environment-script=buildwrapper escaped-markup-plugin=ui -excludeMatrixParent=slaves +excludeMatrixParent=agent Exclusion=builder exclusive-execution=buildwrapper export-params=builder @@ -333,7 +333,7 @@ extensible-choice-parameter=parameter extensivetesting=report external external-monitor-job=misc external external-workspace-manager=pipeline -externalresource-dispatcher=slaves cli android +externalresource-dispatcher=agent cli android extra-columns=listview-column extra-tool-installers=misc extreme-notification=notifier @@ -359,7 +359,7 @@ flow=post-build builder trigger ui fluentd=report flyway-runner=builder fogbugz=external scm-related misc -foreman-node-sharing=slaves +foreman-node-sharing=agent fortify-on-demand-uploader=external report devops misc fortify360=report external fstrigger=trigger @@ -420,7 +420,7 @@ graphiteIntegrator=misc gravatar=user ui greenballs=ui grinder=report -groovy-label-assignment=slaves +groovy-label-assignment=agent groovy-postbuild=post-build groovy-related groovy-remote=builder groovy-related groovy=builder groovy-related @@ -456,7 +456,7 @@ hue-light=notifier humbug=notifier deprecated hyper-build-step=builder hyper-commons=user -hyper-slaves=slaves +hyper-slaves=agent ibm-application-security=builder ibm-security-appscanstandard-scanner=post-build misc icescrum=report external @@ -491,7 +491,7 @@ jboss=misc builder jbpm-embedded-plugin=external jbpm-workflow-plugin=external jcaptcha-plugin=misc -jclouds-jenkins=slaves cluster cloud +jclouds-jenkins=agent cluster cloud jdepend=report JDK_Parameter_Plugin=parameter jenkins-cloudformation-plugin=buildwrapper external notifier @@ -517,7 +517,7 @@ job-exporter=builder job-fan-in= trigger job-import-plugin=misc job-log-logger-plugin=misc buildwrapper -job-node-stalker=misc buildwrapper slaves cluster +job-node-stalker=misc buildwrapper agent cluster job-poll-action-plugin=misc trigger job-restrictions=misc security job-strongauth-simple=builder @@ -542,7 +542,7 @@ junit=report jython=builder kagemai=external kanboard=notifier -keepSlaveOffline=slaves +keepSlaveOffline=agent kerberos-sso=user security keyboard-shortcuts-plugin=misc ui kiuwanJenkinsPlugin=external post-build @@ -550,10 +550,10 @@ klaros-testmanagement=external klocwork=report kmap-jenkins=upload ios android koji=report -kubernetes-ci=cluster builder slaves +kubernetes-ci=cluster builder agent kubernetes=cluster cloud label-linked-jobs=misc report -label-verifier=slaves +label-verifier=agent labeled-test-groups-publisher=report labmanager=cluster lastfailureversioncolumn=listview-column @@ -564,8 +564,8 @@ ldap=user ldapemail=user leastload=misc leiningen-plugin=builder -lenientshutdown=cluster slaves misc cli -libvirt-slave=slaves cluster +lenientshutdown=cluster agent misc cli +libvirt-slave=agent cluster lifx-notifier=notifier liquibase-runner=builder list-command=cli @@ -574,7 +574,7 @@ loaderio-jenkins-plugin=post-build external loadfocus-loadtest=external post-build loadimpact-plugin=post-build external misc locale=ui -lockable-resources=cluster slaves +lockable-resources=cluster agent locked-files-report=misc locks-and-latches=trigger buildwrapper log-command=cli @@ -584,10 +584,10 @@ logfilesizechecker=buildwrapper logging=misc logstash=external buildwrapper report post-build lotus-connections-plugin=notifier -lsf-cloud=slaves builder +lsf-cloud=agent builder m2-repo-reaper=maven m2release=buildwrapper maven -macstadium-orka=cluster slaves ios +macstadium-orka=cluster agent ios mail-watcher-plugin=notifier mailcommander=misc trigger maintenance-jobs-scheduler=misc @@ -620,13 +620,13 @@ memegen=misc memory-map=notifier report mentor-questa-vrm=post-build mercurial=scm -mesos=cluster slaves +mesos=cluster agent metadata=misc cli library ui minio-storage=upload mission-control-view=ui mktmpio=buildwrapper external mock-security-realm=user -mock-slave=slaves +mock-slave=agent modernstatus=ui mongodb-document-upload=upload post-build mongodb=buildwrapper @@ -642,7 +642,7 @@ mstestrunner=builder dotnet mttr=report ui multi-branch-project-plugin=scm-related misc deprecated multi-module-tests-publisher=post-build -multi-slave-config-plugin=slaves cluster +multi-slave-config-plugin=agent cluster multiple-scms=scm mysql-auth=user myst-plugin=misc upload buildwrapper @@ -657,9 +657,9 @@ next-build-number=misc next-executions=ui listview-column nexus-artifact-uploader=upload nexus-task-runner=external -nodelabelparameter=slaves trigger parameter +nodelabelparameter=agent trigger parameter nodenamecolumn=listview-column -nomad=slaves +nomad=agent nopmdcheck=misc nopmdverifytrac=external notification=notifier @@ -673,7 +673,7 @@ octopusdeploy=deployment Office-365-Connector=notifier offlineonfailure-plugin=post-build oic-auth=user -one-shot-executor=slaves +one-shot-executor=agent onesky=misc external ontrack=notifier builder open-stf=android @@ -684,10 +684,10 @@ openshift-deployer=upload external post-build openshift-login=user security openshift-pipeline=pipeline scm-related post-build builder misc openshift-sync=cluster builder scm-related external -openstack-cloud=cluster slaves +openstack-cloud=cluster agent openstack-heat=builder oslc-cm=notifier -ownership=user slaves misc ui buildwrapper +ownership=user agent misc ui buildwrapper p4=scm paaslane-estimate=post-build package-drone=post-build upload @@ -731,7 +731,7 @@ pipeline-maven=maven pipeline pipeline-model-api=pipeline misc pipeline-model-declarative-agent=pipeline misc deprecated pipeline-model-definition=pipeline misc -pipeline-multibranch-defaults=cli trigger misc scm-related slaves +pipeline-multibranch-defaults=cli trigger misc scm-related agent pipeline-npm=pipeline npm pipeline-rest-api=ui pipeline-stage-step=pipeline misc @@ -765,7 +765,7 @@ prometheus=misc promoted-builds-simple=misc ui promoted-builds=misc ui builder protecode-sc=report -proxmox=slaves cluster +proxmox=agent cluster prqa-plugin=notifier report publish-over-cifs=upload publish-over-dropbox=upload @@ -847,7 +847,7 @@ sauce-ondemand=buildwrapper sbt=builder SBuild=builder scala-junit-name-decoder=scala -scalable-amazon-ecs=cluster slaves +scalable-amazon-ecs=cluster agent schedule-build=listview-column Schmant=builder scm-sqs=scm-related external trigger @@ -861,8 +861,8 @@ screenshot=ui buildwrapper script-realm=user script-scm=scm script-security=security -scripted-cloud-plugin=slaves -scriptler=slaves misc groovy-related +scripted-cloud-plugin=agent +scriptler=agent misc groovy-related scripttrigger=trigger SCTMExecutor=builder secondary-timestamper-plugin=post-build @@ -904,12 +904,12 @@ skytap=external slack-uploader=upload notification slack=notifier sladiator-notifier=notifier -slave-setup=cluster slaves -slave-squatter=slaves -slave-status=slaves -slave-utilization-plugin=slaves +slave-setup=cluster agent +slave-squatter=agent +slave-status=agent +slave-utilization-plugin=agent sloccount=report -smart-jenkins=slaves +smart-jenkins=agent smartfrog-plugin=builder sms=notifier snsnotify=notifier post-build @@ -921,10 +921,10 @@ sounds=notifier speaks=notifier splunk-devops=post-build notifier report spoonscript=builder -spotinst=spot spotinst cluster slaves +spotinst=spot spotinst cluster agent sqlplus-script-runner=misc sra-deploy=deployment post-build devops upload -ssh-slaves=slaves +ssh-slaves=agent ssh=buildwrapper stackhammer=external staf=builder @@ -953,10 +953,10 @@ svncompat13=scm-related svncompat14=scm-related svnmerge=scm-related svnpublisher=upload -swarm=slaves +swarm=agent synergy=scm syslog-logger=misc -systemloadaverage-monitor=slaves +systemloadaverage-monitor=agent tap=report tasks=report maven tattletale-plugin=report @@ -985,7 +985,7 @@ tfs=scm thinBackup=misc thread-dump-action-plugin=misc threadfix=post-build -throttle-concurrents=slaves cluster buildwrapper +throttle-concurrents=agent cluster buildwrapper thucydides=report tibco-builder=builder timestamper=buildwrapper @@ -1035,7 +1035,7 @@ violation-comments-to-github=github report post-build analysis devops violation-comments-to-gitlab=gitlab report post-build analysis devops violation-comments-to-stash=stash bitbucket-server bitbucket report post-build analysis devops violations=maven report dotnet -virtualbox=slaves buildwrapper +virtualbox=agent buildwrapper visual-basic-6=buildwrapper visualworks-store=scm vmanager-plugin=builder misc @@ -1045,7 +1045,7 @@ vmware=buildwrapper vncrecorder=buildwrapper vncviewer=buildwrapper vs-code-metrics=dotnet report builder -vsphere-cloud=cluster slaves +vsphere-cloud=cluster agent vss=scm vstestrunner=dotnet builder vsts-cd=notifier @@ -1065,9 +1065,9 @@ windmill=external windocks-start-container=deployment dotnet misc external windows-azure-storage=upload post-build windows-exe-runner=builder -windows-slaves=slaves +windows-slaves=agent wix=post-build -workflow-aggregator=misc cli trigger slaves +workflow-aggregator=misc cli trigger agent workflow-api=misc workflow-basic-steps=pipeline misc workflow-cps-global-lib=misc @@ -1098,7 +1098,7 @@ yaml-axis=misc yammer=notifier yandex-metrica=page-decorator yet-another-build-visualizer=ui -yet-another-docker-plugin=cluster cloud slaves +yet-another-docker-plugin=cluster cloud agent youtrack-plugin=external zanata=misc zapper=post-build