Use the new images

Author: christophfroehlich

.github/workflows/reusable-abi-check.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ros-industrial/industrial_ci@master
         env:
-          DOCKER_IMAGE: ghcr.io/sloretz/ros:${{ inputs.ros_distro }}-ros-base
+          DOCKER_IMAGE: ghcr.io/ros-controls/ros:${{ inputs.ros_distro }}-ubuntu-testing
           ROS_DISTRO: ${{ inputs.ros_distro }}
           ROS_REPO: testing
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}

.github/workflows/reusable-build-coverage.yml

@@ -15,7 +15,7 @@ jobs:
   coverage:
     name: coverage build ${{ inputs.ros_distro }}
     runs-on: ubuntu-latest
-    container: ghcr.io/sloretz/ros:${{ inputs.ros_distro }}-ros-base
+    container: ghcr.io/ros-controls/ros:${{ inputs.ros_distro }}-ubuntu-testing
     defaults:
       run:
         shell: bash

.github/workflows/reusable-industrial-ci-with-cache.yml

@@ -104,15 +104,23 @@ jobs:
           restore-keys: |
             ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
             ccache-${{ env.CACHE_PREFIX }}
+      - name: Get docker image name
+        id: docker_image
+        run: |
+          if [ "${{ inputs.ros_repo }}" = "main" ]; then
+            echo "DOCKER_IMAGE=ghcr.io/ros-controls/ros:${{ inputs.ros_distro }}-ubuntu" >> $GITHUB_OUTPUT
+          else
+            echo "DOCKER_IMAGE=ghcr.io/ros-controls/ros:${{ inputs.ros_distro }}-ubuntu-testing" >> $GITHUB_OUTPUT
+          fi
       - uses: 'ros-industrial/industrial_ci@master'
         env:
           UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
           TARGET_WORKSPACE: ${{ inputs.target_workspace }}
           NOT_TEST_BUILD: ${{ inputs.not_test_build }}
           DOWNSTREAM_WORKSPACE: ${{ inputs.downstream_workspace }}
           NOT_TEST_DOWNSTREAM: ${{ inputs.not_test_downstream }}
-          DOCKER_IMAGE: ghcr.io/sloretz/ros:${{ inputs.ros_distro }}-ros-base
-          ROS_REPO: ${{ inputs.ros_repo }}
+          DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
+          ROS_REPO: ${{ steps.docker_image.outputs.DOCKER_IMAGE }}
           OS_CODE_NAME: ${{ inputs.os_code_name }}
           ROSDEP_SKIP_KEYS: ${{ inputs.rosdep_skip_keys }}
           ADDITIONAL_DEBS: ${{ inputs.additional_debs }}