Skip broken ci-testing image

osrf/ros2:testing doesn't contain /opt/ros!
rhaschke · Apr 15, 2024 · 71b5bb5 · 71b5bb5
1 parent 07786be
commit 71b5bb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 55 deletions.
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
@@ -4,7 +4,7 @@
 # Downloads the moveit source code and install remaining debian dependencies
 
 ARG ROS_DISTRO=rolling
-FROM moveit/moveit2:${ROS_DISTRO}-ci-testing
+FROM moveit/moveit2:${ROS_DISTRO}-ci
 LABEL maintainer Robert Haschke [email protected]
 
 # Export ROS_UNDERLAY for downstream docker containers

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -121,61 +121,8 @@ jobs:
             ${{ env.GH_IMAGE }}
             ${{ env.DH_IMAGE }}
 
-  ci-testing:
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [rolling]
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-    env:
-      GH_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.ROS_DISTRO }}-${{ github.job }}
-      DH_IMAGE: moveit/moveit2:${{ matrix.ROS_DISTRO }}-${{ github.job }}
-      PUSH: ${{ (github.event_name != 'pull_request') && (github.repository == 'ros-planning/moveit2') }}
-
-    steps:
-      - uses: rhaschke/docker-run-action@v5
-        name: Check for apt updates
-        continue-on-error: true
-        id: apt
-        with:
-          image: ${{ env.IMAGE }}
-          run: |
-            apt-get update
-            have_updates=$(apt-get --simulate upgrade | grep -q "^0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.$" && echo false || echo true)
-            echo "no_cache=$have_updates" >> "$GITHUB_OUTPUT"
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Github Container Registry
-        if: env.PUSH == 'true'
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login to DockerHub
-        if: env.PUSH == 'true'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          file: .docker/${{ github.job }}/Dockerfile
-          build-args: OUR_ROS_DISTRO=${{ matrix.ROS_DISTRO }}
-          push: ${{ env.PUSH }}
-          no-cache: ${{ steps.apt.outputs.no_cache || github.event_name == 'workflow_dispatch' }}
-          cache-from: type=registry,ref=${{ env.GH_IMAGE }}
-          cache-to: type=inline
-          tags: |
-            ${{ env.GH_IMAGE }}
-            ${{ env.DH_IMAGE }}
-
   source:
-    needs: ci-testing
+    needs: ci
     strategy:
       fail-fast: false
       matrix: