fix prerelease test in industrial_ci

without ROS_DISTRO, ROS_VERSION_EOL is not set and throws an error in prerelease.sh in industrial_ci
ika-rwth-aachen · Nov 29, 2023 · a5fc786 · a5fc786
1 parent 633f890
commit a5fc786
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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'
+          PRERELEASE: 'true'
+          ROS_DISTRO: noetic # to prevent missing variable ROS_VERSION_EOL during prerelease
diff --git 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'
+    PRERELEASE: 'true'
+    ROS_DISTRO: humble # to prevent missing variable ROS_VERSION_EOL during prerelease