Merge pull request #424 from ros-infrastructure/update_plugin_config

update config of plugins to minimize diff
ros-infrastructure · Apr 21, 2017 · cea3bf5 · cea3bf5
2 parents 8dcc60d + 0e84511
commit cea3bf5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/ros_buildfarm/templates/release/import_package_job.xml.em b/ros_buildfarm/templates/release/import_package_job.xml.em
@@ -8,6 +8,10 @@
     days_to_keep=30,
     num_to_keep=10000,
 ))@
+@(SNIPPET(
+    'property_job-priority',
+    priority=-1,
+))@
 @(SNIPPET(
     'property_requeue-job',
 ))@

diff --git a/ros_buildfarm/templates/release/sync_packages_to_main_job.xml.em b/ros_buildfarm/templates/release/sync_packages_to_main_job.xml.em
@@ -8,6 +8,10 @@
     days_to_keep=100,
     num_to_keep=100,
 ))@
+@(SNIPPET(
+    'property_job-priority',
+    priority=-1,
+))@
 @(SNIPPET(
     'property_requeue-job',
 ))@

diff --git a/ros_buildfarm/templates/release/sync_packages_to_testing_job.xml.em b/ros_buildfarm/templates/release/sync_packages_to_testing_job.xml.em
@@ -8,6 +8,10 @@
     days_to_keep=100,
     num_to_keep=100,
 ))@
+@(SNIPPET(
+    'property_job-priority',
+    priority=-1,
+))@
 @(SNIPPET(
     'property_requeue-job',
 ))@

diff --git a/ros_buildfarm/templates/snippet/publisher_extended-email.xml.em b/ros_buildfarm/templates/snippet/publisher_extended-email.xml.em
@@ -4,7 +4,6 @@
       <configuredTriggers>
         <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
           <email>
-            <recipientList/>
             <subject>$PROJECT_DEFAULT_SUBJECT</subject>
             <body>$PROJECT_DEFAULT_CONTENT</body>
             <recipientProviders>
@@ -19,7 +18,6 @@
         </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
         <hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
           <email>
-            <recipientList/>
             <subject>$PROJECT_DEFAULT_SUBJECT</subject>
             <body>$PROJECT_DEFAULT_CONTENT</body>
             <recipientProviders>

diff --git a/ros_buildfarm/templates/snippet/publisher_warnings.xml.em b/ros_buildfarm/templates/snippet/publisher_warnings.xml.em
@@ -2,7 +2,7 @@
       <healthy/>
       <unHealthy/>
       <thresholdLimit>low</thresholdLimit>
-      <pluginName>[WARNINGS]</pluginName>
+      <pluginName>[WARNINGS] </pluginName>
       <defaultEncoding/>
       <canRunOnFailed>false</canRunOnFailed>
       <usePreviousBuildAsReference>false</usePreviousBuildAsReference>

diff --git a/ros_buildfarm/templates/snippet/trigger_github-pull-request-builder.xml.em b/ros_buildfarm/templates/snippet/trigger_github-pull-request-builder.xml.em
@@ -1,6 +1,7 @@
     <org.jenkinsci.plugins.ghprb.GhprbTrigger plugin="ghprb@@1.36.1">
       <spec/>
-      <triggerPhrase/>
+      <latestVersion>3</latestVersion>
+      <configVersion>3</configVersion>
       <adminlist/>
       <allowMembersOfWhitelistedOrgsAsAdmin>true</allowMembersOfWhitelistedOrgsAsAdmin>
       <orgslist>@ESCAPE(github_orgunit)</orgslist>
@@ -17,13 +18,17 @@
           <branch>@ESCAPE(branch_name)</branch>
         </org.jenkinsci.plugins.ghprb.GhprbBranch>
       </whiteListTargetBranches>
-      <project>@ESCAPE(job_name)</project>
+      <triggerPhrase/>
+      <skipBuildPhrase>.*\[skip\W+ci\].*</skipBuildPhrase>
+      <blackListLabels/>
+      <whiteListLabels/>
       <extensions>
         <org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus>
           <commitStatusContext>@ESCAPE(job_name)</commitStatusContext>
           <triggeredStatus/>
           <startedStatus/>
           <statusUrl/>
+          <addTestResults>false</addTestResults>
         </org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus>
       </extensions>
     </org.jenkinsci.plugins.ghprb.GhprbTrigger>