Remove ci-testing from humble

moveit · Nov 11, 2024 · 9f02d0b · 9f02d0b
1 parent 2e310c3
commit 9f02d0b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 114 deletions.
diff --git a/.docker/ci-testing/Dockerfile b/.docker/ci-testing/Dockerfile
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 rhaschke@techfak.uni-bielefeld.de
 
 # Export ROS_UNDERLAY for downstream docker containers

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,8 +19,6 @@ jobs:
           - IMAGE: humble-ci
             CCOV: true
             ROS_DISTRO: humble
-          - IMAGE: humble-ci-testing
-            ROS_DISTRO: humble
             IKFAST_TEST: true
             CLANG_TIDY: pedantic
             # Silent gmock/gtest warnings by picking more recent googletest version

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -97,49 +97,8 @@ jobs:
             ${{ env.GH_IMAGE }}
             ${{ env.DH_IMAGE }}
 
-  ci-testing:
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [humble]
-    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:
-      - 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: true
-          tags: |
-            ${{ env.GH_IMAGE }}
-            ${{ env.DH_IMAGE }}
-
   source:
-    needs: ci-testing
+    needs: ci
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/docker_lint.yaml b/.github/workflows/docker_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DOCKERFILE_PATH: [ci, ci-testing, release, source]
+        DOCKERFILE_PATH: [ci, release, source]
 
     name: Lint Dockerfiles
     runs-on: ubuntu-latest