Merge branch 'master' into blacklist-image-tools-py

Signed-off-by: Scott K Logan <[email protected]>

job_templates/ci_job.xml.em

@@ -4,11 +4,11 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@@1.25.1">
+    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@@1.29.3">
       <projectUrl>@(ci_scripts_repository)/</projectUrl>
       <displayName />
     </com.coravy.hudson.plugins.github.GithubProjectProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.25">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.29">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -30,7 +30,7 @@
     enable_c_coverage_default=enable_c_coverage_default,
 ))@
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@@3.0.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@@3.9.1">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -76,7 +76,7 @@
   <builders>
     <hudson.plugins.groovy.SystemGroovy plugin="groovy@@2.0">
       <source class="hudson.plugins.groovy.StringSystemScriptSource">
-        <script plugin="script-security@@1.27">
+        <script plugin="script-security@@1.49">
           <script><![CDATA[build.setDescription("""\
 branch: ${build.buildVariableResolver.resolve('CI_BRANCH_TO_TEST')}, <br/>
 use_connext_static: ${build.buildVariableResolver.resolve('CI_USE_CONNEXT_STATIC')}, <br/>
@@ -225,7 +225,9 @@ echo "# END SECTION"
 @[  end if]@
 @[elif os_name == 'windows']@
 setlocal enableDelayedExpansion
-rmdir /S /Q ws workspace "work space"
+REM rmdir /S /Q ws workspace "work space"
+rmdir /S /Q ws\build ws\install ws\src
+del ws\00-ros2.repos ws\env.bat
 
 echo "# BEGIN SECTION: Determine arguments"
 set "PATH=!PATH:"=!"
@@ -308,7 +310,7 @@ echo "# END SECTION"
     'publisher_xunit',
 ))@
 @[if mailer_recipients]@
-    <hudson.tasks.Mailer plugin="mailer@@1.20">
+    <hudson.tasks.Mailer plugin="mailer@@1.22">
       <recipients>@(mailer_recipients)</recipients>
       <dontNotifyEveryUnstableBuild>@(dont_notify_every_unstable_build)</dontNotifyEveryUnstableBuild>
       <sendToIndividuals>false</sendToIndividuals>
@@ -317,7 +319,7 @@ echo "# END SECTION"
   </publishers>
   <buildWrappers>
 @[if build_timeout_mins]@
-    <hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@@1.18">
+    <hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@@1.19">
       <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
         <timeoutMinutes>@(build_timeout_mins)</timeoutMinutes>
       </strategy>
@@ -326,12 +328,12 @@ echo "# END SECTION"
       </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
 @[end if]@
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@@1.8.8" />
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@@0.5.0">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@@1.8.10" />
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@@0.5.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
 @[if os_name != 'windows']@
-    <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@@1.15">
+    <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@@1.17">
       <credentialIds>
         <string>1c2004f6-2e00-425d-a421-2e1ba62ca7a7</string>
       </credentialIds>

job_templates/ci_launcher_job.xml.em

@@ -7,7 +7,7 @@
   </description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.25">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.29">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -40,7 +40,7 @@
   <builders>
     <hudson.plugins.groovy.SystemGroovy plugin="groovy@@2.0">
       <source class="hudson.plugins.groovy.StringSystemScriptSource">
-        <script plugin="script-security@@1.27">
+        <script plugin="script-security@@1.49">
           <script>// PREDICT TRIGGERED BUILDS AND GENERATE MARKDOWN FOR BUILD STATUS
 
 import jenkins.model.Jenkins
@@ -84,7 +84,7 @@ for (item in build_numbers) {
   </builders>
   <publishers>
 @[for os_name, os_data in os_specific_data.items()]@
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@@2.33">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@@2.35.2">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>

job_templates/packaging_job.xml.em

@@ -4,11 +4,11 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@@1.25.1">
+    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@@1.29.3">
       <projectUrl>@(ci_scripts_repository)/</projectUrl>
       <displayName />
     </com.coravy.hudson.plugins.github.GithubProjectProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.25">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@@1.29">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -40,11 +40,12 @@
           <name>CI_TEST_ARGS</name>
           <description>Additional arguments passed to the 'test' verb if testing the bridge.</description>
           <defaultValue>@(test_args_default)</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@@3.0.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@@3.9.1">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +91,7 @@
   <builders>
     <hudson.plugins.groovy.SystemGroovy plugin="groovy@@2.0">
       <source class="hudson.plugins.groovy.StringSystemScriptSource">
-        <script plugin="script-security@@1.27">
+        <script plugin="script-security@@1.49">
           <script><![CDATA[build.setDescription("""\
 @[if 'linux' in os_name]@
 ubuntu_distro: ${build.buildVariableResolver.resolve('CI_UBUNTU_DISTRO')}, <br/>
@@ -297,20 +298,20 @@ echo "# END SECTION"
       <caseSensitive>true</caseSensitive>
     </hudson.tasks.ArtifactArchiver>
 @[if mailer_recipients]@
-    <hudson.tasks.Mailer plugin="mailer@@1.20">
+    <hudson.tasks.Mailer plugin="mailer@@1.22">
       <recipients>@(mailer_recipients)</recipients>
       <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
       <sendToIndividuals>false</sendToIndividuals>
     </hudson.tasks.Mailer>
 @[end if]@
   </publishers>
   <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@@1.8.8" />
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@@0.5.0">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@@1.8.10" />
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@@0.5.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
 @[if os_name != 'windows']@
-    <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@@1.15">
+    <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@@1.17">
       <credentialIds>
         <string>1c2004f6-2e00-425d-a421-2e1ba62ca7a7</string>
       </credentialIds>

job_templates/snippet/property_parameter-definition.xml.em

@@ -35,6 +35,7 @@ This tests the robustness to whitespace being within the different paths.</descr
           <name>CI_TEST_ARGS</name>
           <description>Additional arguments passed to the 'test' verb.</description>
           <defaultValue>@(test_args_default)</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>

job_templates/snippet/property_parameter-definition_common.xml.em

@@ -7,30 +7,35 @@ The repositories with the 'feature' branch will be changed to that bra
 Other repositories will stay on the default branch, usually 'master'.
 To use the default branch on all repositories, use an empty string.</description>
           <defaultValue></defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>CI_SCRIPTS_BRANCH</name>
           <description>Branch of ros2/ci repository from which to get the ci scripts.</description>
           <defaultValue>@ci_scripts_default_branch</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>CI_ROS2_REPOS_URL</name>
           <description>Custom .repos file to use instead of the default (@default_repos_url).
 For example, copy the content of the .repos file to a GitHub Gist, modify it to your needs, and then pass the raw URL here.</description>
           <defaultValue></defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>CI_ROS2_SUPPLEMENTAL_REPOS_URL</name>
           <description>Supplemental .repos file which will be merged into the default repos file.
 Use this instead of the Custom .repos file if you want to add to the default repos file rather than replace it.</description>
           <defaultValue>@supplemental_repos_url</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>CI_COLCON_BRANCH</name>
           <description>Use a specific branch of the colcon repositories.
 If the branch doesn't exist fall back to the default branch.
 To use the latest released version, use an empty string.</description>
           <defaultValue></defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>CI_UBUNTU_DISTRO</name>
@@ -68,4 +73,5 @@ choices.remove(cmake_build_type)
           <name>CI_BUILD_ARGS</name>
           <description>Additional arguments passed to the 'build' verb.</description>
           <defaultValue>@(build_args_default)</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>

job_templates/snippet/publisher_cobertura.xml.em

@@ -1,4 +1,4 @@
-    <hudson.plugins.cobertura.CoberturaPublisher plugin="cobertura@@1.9.8">
+    <hudson.plugins.cobertura.CoberturaPublisher plugin="cobertura@@1.13">
       <coberturaReportFile>ws/build*/**/*coverage.xml</coberturaReportFile>
       <onlyStable>false</onlyStable>
       <failUnhealthy>false</failUnhealthy>
@@ -8,6 +8,14 @@
       <zoomCoverageChart>false</zoomCoverageChart>
       <maxNumberOfBuilds>0</maxNumberOfBuilds>
       <failNoReports>false</failNoReports>
+      @# CoverageTargets values consist of three decimal numbers.
+      @#  First: The target value above which a build is considered "100% healthy/sunny".
+      @#  Second: The target value below which a build is considered "0% healthy/stormy".
+      @#  Third: The target value below which a build is considered "Unstable".
+      @# The values below are the plugin defaults.
+      <lineCoverageTargets>80, 0, 0</lineCoverageTargets>
+      <methodCoverageTargets>80, 0, 0</methodCoverageTargets>
+      <conditionalCoverageTargets>70, 0, 0</conditionalCoverageTargets>
       <healthyTarget>
         <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
           <entry>

job_templates/snippet/publisher_warnings.xml.em

@@ -1,4 +1,4 @@
-    <hudson.plugins.warnings.WarningsPublisher plugin="warnings@@4.62">
+    <hudson.plugins.warnings.WarningsPublisher plugin="warnings@@5.0.0">
       <healthy/>
       <unHealthy/>
       <thresholdLimit>low</thresholdLimit>
@@ -8,7 +8,7 @@
       <usePreviousBuildAsReference>false</usePreviousBuildAsReference>
       <useStableBuildAsReference>false</useStableBuildAsReference>
       <useDeltaValues>false</useDeltaValues>
-      <thresholds plugin="analysis-core@@1.86">
+      <thresholds plugin="analysis-core@@1.95">
         <unstableTotalAll>0</unstableTotalAll>
         <unstableTotalHigh/>
         <unstableTotalNormal/>
@@ -32,6 +32,7 @@
       <includePattern/>
       <excludePattern>.*Microsoft.CppCommon.targets</excludePattern>
       <messagesPattern/>
+      <categoriesPattern/>
       <parserConfigurations/>
       <consoleParsers>
         <hudson.plugins.warnings.ConsoleParser>

ros2_batch_job/__main__.py

@@ -127,8 +127,7 @@ def main(sysargv=None):
     if sys.platform.lower().startswith('linux') and platform.linux_distribution()[2] == 'xenial':
         blacklisted_package_names += [
             'image_tools_py',
-            'qt_gui_cpp',
-            'rqt_gui_cpp',
+            'qt_dotgraph',
         ]
     return run(args, build_function, blacklisted_package_names=blacklisted_package_names)
 
@@ -402,7 +401,9 @@ def run(args, build_function, blacklisted_package_names=None):
         remove_folder(os.path.join(args.workspace, 'build'))
         remove_folder(os.path.join(args.workspace, 'install'))
     else:
-        remove_folder(args.workspace)
+        # temporary keep the workspace (actually the logs) on Windows
+        if args.os != 'windows':
+            remove_folder(args.workspace)
     if not os.path.isdir(args.workspace):
         os.makedirs(args.workspace)
 

ros2_batch_job/windows_batch/__init__.py

@@ -62,7 +62,7 @@ def setup_env(self):
 
         # Generate the env file
         if os.path.exists('env.bat'):
-            shutil.rmtree('env.bat')
+            os.remove('env.bat')
         with open('env.bat', 'w') as f:
             f.write("@echo off" + os.linesep)
             f.write(