From d8f17f14f9b693928ce6f4bd90e8c4b3fe8e80eb Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 16 Jun 2020 14:10:40 -0700 Subject: [PATCH 1/2] set default ROS distro to rolling Signed-off-by: Dirk Thomas --- create_jenkins_job.py | 2 +- .../snippet/property_parameter-definition_common.xml.em | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/create_jenkins_job.py b/create_jenkins_job.py index 16b512803..9e8f31456 100755 --- a/create_jenkins_job.py +++ b/create_jenkins_job.py @@ -91,7 +91,7 @@ def main(argv=None): 'turtlebot_demo': False, 'build_timeout_mins': 0, 'ubuntu_distro': 'focal', - 'ros_distro': 'foxy', + 'ros_distro': 'rolling', } jenkins = connect(args.jenkins_url) diff --git a/job_templates/snippet/property_parameter-definition_common.xml.em b/job_templates/snippet/property_parameter-definition_common.xml.em index 5e5bd63cb..0fa444dc7 100644 --- a/job_templates/snippet/property_parameter-definition_common.xml.em +++ b/job_templates/snippet/property_parameter-definition_common.xml.em @@ -60,7 +60,7 @@ choices.remove(ubuntu_distro) @ros_distro @{ -choices = ['dashing', 'eloquent', 'foxy'] +choices = ['dashing', 'eloquent', 'foxy', 'rolling] choices.remove(ros_distro) }@ @[for choice in choices]@ From e4202702b14a07dfeb4a752f7a69717dfdf0da3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 17 Jun 2020 09:00:06 -0400 Subject: [PATCH 2/2] Use the foxy Dockerfile for rolling on Windows. --- job_templates/ci_job.xml.em | 4 ++++ job_templates/packaging_job.xml.em | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em index e60e459da..a998f2d07 100644 --- a/job_templates/ci_job.xml.em +++ b/job_templates/ci_job.xml.em @@ -358,6 +358,10 @@ setlocal enableDelayedExpansion rmdir /S /Q ws workspace "work space" echo "# BEGIN SECTION: Build DockerFile" +@# Rolling uses the Foxy Dockerfile. +if "!CI_ROS_DISTRO!" == "rolling" ( + set "CI_ROS_DISTRO=foxy" +) @# Eloquent uses the Dashing Dockerfile. if "!CI_ROS_DISTRO!" == "eloquent" ( set "CI_ROS_DISTRO=dashing" diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em index fc2d4cdf5..f2416816a 100644 --- a/job_templates/packaging_job.xml.em +++ b/job_templates/packaging_job.xml.em @@ -344,6 +344,10 @@ setlocal enableDelayedExpansion rmdir /S /Q ws workspace echo "# BEGIN SECTION: Build DockerFile" +@# Rolling uses the Foxy Dockerfile. +if "!CI_ROS_DISTRO!" == "rolling" ( + set "CI_ROS_DISTRO=foxy" +) @# Eloquent uses the Dashing Dockerfile. if "!CI_ROS_DISTRO!" == "eloquent" ( set "CI_ROS_DISTRO=dashing"