From 7a2e5206dcdafbcc56fb733b84640c5254d75f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 27 Jan 2022 09:42:12 -0800 Subject: [PATCH 1/2] Update label expression for consistent style. Other compound label expressions in this repository and in configuration files use spaces between the operators and strings. --- ros_buildfarm/templates/status/blocked_releases_page_job.xml.em | 2 +- .../templates/status/blocked_source_entries_page_job.xml.em | 2 +- ros_buildfarm/templates/status/release_compare_page_job.xml.em | 2 +- ros_buildfarm/templates/status/release_status_page_job.xml.em | 2 +- ros_buildfarm/templates/status/repos_status_page_job.xml.em | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em index 624889b8b..c2547c3f3 100644 --- a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em +++ b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master||buildagent + agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em index 1bd909ed0..5ef6f1c9b 100644 --- a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em +++ b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master||buildagent + agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/release_compare_page_job.xml.em b/ros_buildfarm/templates/status/release_compare_page_job.xml.em index 801476884..6b6f354bc 100644 --- a/ros_buildfarm/templates/status/release_compare_page_job.xml.em +++ b/ros_buildfarm/templates/status/release_compare_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master||buildagent + agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/release_status_page_job.xml.em b/ros_buildfarm/templates/status/release_status_page_job.xml.em index d3400db4f..669104d50 100644 --- a/ros_buildfarm/templates/status/release_status_page_job.xml.em +++ b/ros_buildfarm/templates/status/release_status_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master||buildagent + agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/repos_status_page_job.xml.em b/ros_buildfarm/templates/status/repos_status_page_job.xml.em index 740626627..1a4d0e19d 100644 --- a/ros_buildfarm/templates/status/repos_status_page_job.xml.em +++ b/ros_buildfarm/templates/status/repos_status_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master||buildagent + agent_on_master || buildagent false false false From 9493f527ac06a4a57a0ba93fb449752442fb2a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 27 Jan 2022 09:52:28 -0800 Subject: [PATCH 2/2] Update label expression to include agent_on_jenkins. The agent_on_master was renamed to agent_on_jenkins in the migration to cookbook-ros-buildfarm and Ubuntu 20.04. To maintain compatibility the cookbook still applies the label agent_on_master to the agent_on_jenkins but since Jenkins upstream is updating the name of the built-in agent this seems like a good time to update the labels in ROS build farm. A future release of ROS Buildfarm can remove the old names and simplify the label expressions again. --- ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em | 2 +- ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em | 2 +- ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em | 2 +- .../templates/release/release_reconfigure-jobs_job.xml.em | 2 +- ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em | 2 +- ros_buildfarm/templates/status/blocked_releases_page_job.xml.em | 2 +- .../templates/status/blocked_source_entries_page_job.xml.em | 2 +- ros_buildfarm/templates/status/release_compare_page_job.xml.em | 2 +- ros_buildfarm/templates/status/release_status_page_job.xml.em | 2 +- ros_buildfarm/templates/status/repos_status_page_job.xml.em | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em index 3db683890..768215163 100644 --- a/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em +++ b/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em @@ -40,7 +40,7 @@ refspec=None, ))@ 2 - agent_on_master + agent_on_jenkins || agent_on_master false false false diff --git a/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em index 1504d5b46..89a760a32 100644 --- a/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em +++ b/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em @@ -45,7 +45,7 @@ refspec=None, ))@ 2 - agent_on_master + agent_on_jenkins || agent_on_master false false false diff --git a/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em index 436177188..39d2f0b1a 100644 --- a/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em +++ b/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em @@ -45,7 +45,7 @@ refspec=None, ))@ 2 - agent_on_master + agent_on_jenkins || agent_on_master false false false diff --git a/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em index c1866ef6c..10a87d404 100644 --- a/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em +++ b/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em @@ -45,7 +45,7 @@ refspec=None, ))@ 2 - agent_on_master + agent_on_jenkins || agent_on_master false false false diff --git a/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em b/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em index 6d52a38c6..4925c33e9 100644 --- a/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em +++ b/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em @@ -58,7 +58,7 @@ if missed_jobs: refspec=None, ))@ 2 - agent_on_master + agent_on_jenkins || agent_on_master false false false diff --git a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em index c2547c3f3..a18d87c68 100644 --- a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em +++ b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master || buildagent + agent_on_jenkins || agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em index 5ef6f1c9b..c0707f38b 100644 --- a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em +++ b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master || buildagent + agent_on_jenkins || agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/release_compare_page_job.xml.em b/ros_buildfarm/templates/status/release_compare_page_job.xml.em index 6b6f354bc..0a82562f5 100644 --- a/ros_buildfarm/templates/status/release_compare_page_job.xml.em +++ b/ros_buildfarm/templates/status/release_compare_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master || buildagent + agent_on_jenkins || agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/release_status_page_job.xml.em b/ros_buildfarm/templates/status/release_status_page_job.xml.em index 669104d50..74501778e 100644 --- a/ros_buildfarm/templates/status/release_status_page_job.xml.em +++ b/ros_buildfarm/templates/status/release_status_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master || buildagent + agent_on_jenkins || agent_on_master || buildagent false false false diff --git a/ros_buildfarm/templates/status/repos_status_page_job.xml.em b/ros_buildfarm/templates/status/repos_status_page_job.xml.em index 1a4d0e19d..a70775d52 100644 --- a/ros_buildfarm/templates/status/repos_status_page_job.xml.em +++ b/ros_buildfarm/templates/status/repos_status_page_job.xml.em @@ -30,7 +30,7 @@ refspec=None, ))@ 2 - agent_on_master || buildagent + agent_on_jenkins || agent_on_master || buildagent false false false