update system groovy configuration

ros-infrastructure · Apr 14, 2017 · 5f26513 · 5f26513
1 parent 8e39c0c
commit 5f26513
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 41 deletions.
diff --git a/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em
@@ -59,13 +59,6 @@
     'builder_shell_key-files',
     script_generating_key_files=script_generating_key_files,
 ))@
-@(SNIPPET(
-    'builder_shell',
-    script="""rm -fr $WORKSPACE/classpath
-mkdir -p $WORKSPACE/classpath
-cd $WORKSPACE/classpath
-wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/java-diff-utils/diffutils-1.2.1.jar""",
-))@
 @(SNIPPET(
     'builder_shell',
     script='\n'.join([
@@ -120,7 +113,6 @@ wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v
     'builder_system-groovy',
     command=None,
     script_file='$WORKSPACE/reconfigure_jobs/reconfigure_jobs.groovy',
-    classpath='$WORKSPACE/classpath/diffutils-1.2.1.jar',
 ))@
   </builders>
   <publishers>

diff --git a/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em
@@ -59,13 +59,6 @@
     'builder_shell_key-files',
     script_generating_key_files=script_generating_key_files,
 ))@
-@(SNIPPET(
-    'builder_shell',
-    script="""rm -fr $WORKSPACE/classpath
-mkdir -p $WORKSPACE/classpath
-cd $WORKSPACE/classpath
-wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/java-diff-utils/diffutils-1.2.1.jar""",
-))@
 @(SNIPPET(
     'builder_shell',
     script='\n'.join([
@@ -120,7 +113,6 @@ wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v
     'builder_system-groovy',
     command=None,
     script_file='$WORKSPACE/reconfigure_jobs/reconfigure_jobs.groovy',
-    classpath='$WORKSPACE/classpath/diffutils-1.2.1.jar',
 ))@
   </builders>
   <publishers>

diff --git a/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em
@@ -59,13 +59,6 @@
     'builder_shell_key-files',
     script_generating_key_files=script_generating_key_files,
 ))@
-@(SNIPPET(
-    'builder_shell',
-    script="""rm -fr $WORKSPACE/classpath
-mkdir -p $WORKSPACE/classpath
-cd $WORKSPACE/classpath
-wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/java-diff-utils/diffutils-1.2.1.jar""",
-))@
 @(SNIPPET(
     'builder_shell',
     script='\n'.join([
@@ -120,7 +113,6 @@ wget --no-verbose https://storage.googleapis.com/google-code-archive-downloads/v
     'builder_system-groovy',
     command=None,
     script_file='$WORKSPACE/reconfigure_jobs/reconfigure_jobs.groovy',
-    classpath='$WORKSPACE/classpath/diffutils-1.2.1.jar',
 ))@
   </builders>
   <publishers>

diff --git a/ros_buildfarm/templates/release/release_trigger-broken-with-non-broken-upstream_job.xml.em b/ros_buildfarm/templates/release/release_trigger-broken-with-non-broken-upstream_job.xml.em
@@ -106,7 +106,6 @@ for (p in hudson.model.Hudson.instance.projects) {
 }
 """ % (source_project_name_prefix, binary_project_name_prefix),
     script_file=None,
-    classpath='',
 ))@
   </builders>
   <publishers>

diff --git a/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em b/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em
@@ -113,7 +113,6 @@
     'builder_system-groovy',
     command=None,
     script_file='$WORKSPACE/trigger_jobs/trigger_jobs.groovy',
-    classpath='',
 ))@
   </builders>
   <publishers>

diff --git a/ros_buildfarm/templates/snippet/builder_check-docker.xml.em b/ros_buildfarm/templates/snippet/builder_check-docker.xml.em
@@ -49,7 +49,6 @@ while ((line = br.readLine()) != null) {
 println "docker seems operational, continuing"
 """,
     script_file=None,
-    classpath='',
 ))@
 @(SNIPPET(
     'builder_shell',

diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy.xml.em
@@ -1,14 +1,15 @@
     <hudson.plugins.groovy.SystemGroovy plugin="groovy@@2.0">
 @[if command]@
-      <scriptSource class="hudson.plugins.groovy.StringScriptSource">
-        <command>@ESCAPE(command)</command>
-      </scriptSource>
+      <source class="hudson.plugins.groovy.StringSystemScriptSource">
+        <script plugin="[email protected]">
+          <script>@ESCAPE(command)</script>
+          <sandbox>false</sandbox>
+        </script>
+      </source>
 @[end if]@
 @[if script_file]@
-      <scriptSource class="hudson.plugins.groovy.FileScriptSource">
+      <source class="hudson.plugins.groovy.FileSystemScriptSource">
         <scriptFile>@ESCAPE(script_file)</scriptFile>
-      </scriptSource>
+      </source>
 @[end if]@
-      <bindings/>
-      <classpath>@classpath</classpath>
     </hudson.plugins.groovy.SystemGroovy>
diff --git a/...farm/templates/snippet/builder_system-groovy_check-free-disk-space-disabled-slaves.xml.em b/...farm/templates/snippet/builder_system-groovy_check-free-disk-space-disabled-slaves.xml.em
@@ -29,5 +29,4 @@ for (computer in Jenkins.instance.getComputers()) {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy_check-free-disk-space.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy_check-free-disk-space.xml.em
@@ -52,5 +52,4 @@ try {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy_check-triggered-build.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy_check-triggered-build.xml.em
@@ -54,5 +54,4 @@ try {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy_dashboard.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy_dashboard.xml.em
@@ -142,5 +142,4 @@ for (v in view_stats) {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy_extract-warnings.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy_extract-warnings.xml.em
@@ -43,5 +43,4 @@ try {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/builder_system-groovy_verify-upstream.xml.em b/ros_buildfarm/templates/snippet/builder_system-groovy_verify-upstream.xml.em
@@ -82,5 +82,4 @@ try {
 }
 """,
     script_file=None,
-    classpath='',
 ))@
diff --git a/ros_buildfarm/templates/snippet/trigger-jobs_job.xml.em b/ros_buildfarm/templates/snippet/trigger-jobs_job.xml.em
@@ -130,7 +130,6 @@ for (p in hudson.model.Hudson.instance.getAllItems(AbstractProject)) {
 }
 """ % ('true' if has_force_parameter else 'false', project_name_pattern),
     script_file=None,
-    classpath='',
 ))@
   </builders>
   <publishers>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,4 @@ for (computer in Jenkins.instance.getComputers()) { @@
     }
     """,
         script_file=None,
-        classpath='',
     ))@