diff --git a/.github/workflows/docker-ros.yml b/.github/workflows/docker-ros.yml index ed4eadb04..7c6a4656b 100644 --- a/.github/workflows/docker-ros.yml +++ b/.github/workflows/docker-ros.yml @@ -15,11 +15,12 @@ jobs: base-image: rwthika/ros:noetic command: roslaunch etsi_its_conversion converter.ros1.launch enable-recursive-vcs-import: 'false' - vcs-import-file: '.ros1.repos' + vcs-import-file: .ros1.repos enable-industrial-ci: 'true' env: # industrial_ci variables PRERELEASE: 'true' - UPSTREAM_WORKSPACE: '.ros1.repos' + ROS_DISTRO: noetic # to prevent missing variable ROS_VERSION_EOL during prerelease + UPSTREAM_WORKSPACE: .ros1.repos ros2: runs-on: ubuntu-latest @@ -35,4 +36,5 @@ jobs: enable-recursive-vcs-import: 'false' enable-industrial-ci: 'true' env: # industrial_ci variables - PRERELEASE: 'true' \ No newline at end of file + PRERELEASE: 'true' + ROS_DISTRO: noetic # to prevent missing variable ROS_VERSION_EOL during prerelease \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d3d7f2bb..247b3078c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,11 +17,12 @@ ROS: BASE_IMAGE: rwthika/ros:noetic COMMAND: roslaunch etsi_its_conversion converter.ros1.launch ENABLE_RECURSIVE_VCS_IMPORT: 'false' - VCS_IMPORT_FILE: '.ros1.repos' + VCS_IMPORT_FILE: .ros1.repos ENABLE_INDUSTRIAL_CI: 'true' # industrial_ci variables PRERELEASE: 'true' - UPSTREAM_WORKSPACE: '.ros1.repos' + ROS_DISTRO: noetic # to prevent missing variable ROS_VERSION_EOL during prerelease + UPSTREAM_WORKSPACE: .ros1.repos ROS 2: trigger: @@ -38,4 +39,5 @@ ROS 2: ENABLE_RECURSIVE_VCS_IMPORT: 'false' ENABLE_INDUSTRIAL_CI: 'true' # industrial_ci variables - PRERELEASE: 'true' \ No newline at end of file + PRERELEASE: 'true' + ROS_DISTRO: humble # to prevent missing variable ROS_VERSION_EOL during prerelease \ No newline at end of file