Support running rolling tests on jammy

ros-industrial · Mar 29, 2024 · 76cec3c · 76cec3c
1 parent 49154d4
commit 76cec3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,14 +41,23 @@ jobs:
         - galactic
         - humble
         - iron
-        - rolling
+        include:
+          - distro: rolling
+            ubuntu: jammy
+        include:
+          - distro: rolling
+            ubuntu:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: ardent does not support conditions in package.xml
         run: |
           echo "BEFORE_BUILD_TARGET_WORKSPACE=sed -i /condition/d /root/target_ws/src/industrial_ci/industrial_ci/package.xml" >> "$GITHUB_ENV"
         if: matrix.distro == 'ardent'
+      - name: set OS_CODE_NAME
+        run: |
+          echo "OS_CODE_NAME=${{ matrix.ubuntu }}" >> "$GITHUB_ENV"
+        if: ${{ matrix.ubuntu }}
       - uses: './'
         env:
           ROS_DISTRO: ${{ matrix.distro }}

diff --git a/industrial_ci/src/ros.sh b/industrial_ci/src/ros.sh
@@ -96,6 +96,12 @@ function _set_ros_defaults {
         ;;
     "rolling")
         _ros2_defaults "noble"
+        if [ "$OS_CODE_NAME" == "jammy" ]; then
+            if [ -z "$ROSDISTRO_INDEX_VERSION" ]; then
+                ici_warn "Pinning rolling to latest support version on jammy: 2024-02-28"
+                export ROSDISTRO_INDEX_VERSION=rolling/2024-02-28
+            fi
+        fi
         ;;
     "false")
         unset ROS_DISTRO