From 9f02d0b25e59d2c8576f3caee1f6d5cb3e79a551 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 11 Nov 2024 11:31:21 -0500 Subject: [PATCH] Remove ci-testing from humble --- .docker/ci-testing/Dockerfile | 68 ------------------------------ .docker/source/Dockerfile | 2 +- .github/workflows/ci.yaml | 2 - .github/workflows/docker.yaml | 43 +------------------ .github/workflows/docker_lint.yaml | 2 +- 5 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 .docker/ci-testing/Dockerfile diff --git a/.docker/ci-testing/Dockerfile b/.docker/ci-testing/Dockerfile deleted file mode 100644 index 45c18e07d6..0000000000 --- a/.docker/ci-testing/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -# ghcr.io/ros-planning/moveit2:${OUR_ROS_DISTRO}-ci-testing -# CI image using the ROS testing repository - -FROM osrf/ros2:testing -LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de - -ENV TERM xterm - -# Overwrite the ROS_DISTRO set in osrf/ros2:testing to the distro tied to this Dockerfile (OUR_ROS_DISTRO). -# In case ROS_DISTRO is now different from what was set in osrf/ros2:testing, run `rosdep update` again -# to get any missing dependencies. -# https://docs.docker.com/engine/reference/builder/#using-arg-variables explains why ARG and ENV can't have -# the same name (ROS_DISTRO is an ENV in the osrf/ros2:testing image). -ARG OUR_ROS_DISTRO=rolling -ENV ROS_DISTRO=${OUR_ROS_DISTRO} -RUN rosdep update --rosdistro $ROS_DISTRO - -# Install ROS 2 base packages and build tools -# We are installing ros--ros-base here to mimic the behavior of the ros:-ros-base images. -# This step is split into a separate layer so that we can rely on cached dependencies instead of having -# to install them with every new build. The testing image and packages will only update every couple weeks. -RUN \ - # Update apt package list as previous containers clear the cache - apt-get -q update && \ - apt-get -q -y upgrade && \ - # - # Install base dependencies - apt-get -q install --no-install-recommends -y \ - # Some basic requirements - wget git sudo curl \ - # Preferred build tools - clang clang-format-14 clang-tidy clang-tools \ - ccache \ - ros-"$ROS_DISTRO"-ros-base && \ - # - # Clear apt-cache to reduce image size - rm -rf /var/lib/apt/lists/* - -# Setup (temporary) ROS workspace -WORKDIR /root/ws_moveit - -# Copy MoveIt sources from docker context -COPY . src/moveit2 - -# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size -# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#minimize-the-number-of-layers -RUN \ - # Update apt package list as previous containers clear the cache - apt-get -q update && \ - apt-get -q -y upgrade && \ - # - # Globally disable git security - # https://github.blog/2022-04-12-git-security-vulnerability-announced - git config --global --add safe.directory "*" && \ - # - # Fetch all dependencies from moveit2.repos - vcs import src < src/moveit2/moveit2.repos && \ - if [ -r src/moveit2/moveit2_"$ROS_DISTRO".repos ] ; then vcs import src < src/moveit2/moveit2_"$ROS_DISTRO".repos ; fi && \ - # - # Download all dependencies of MoveIt - rosdep update && \ - DEBIAN_FRONTEND=noninteractive \ - rosdep install -y --from-paths src --ignore-src --rosdistro "$ROS_DISTRO" --as-root=apt:false && \ - # Remove the source code from this container - rm -rf src && \ - # - # Clear apt-cache to reduce image size - rm -rf /var/lib/apt/lists/* diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile index 2b9082885e..d665d02ab2 100644 --- 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 index 78a7067fa6..d63720fa6b 100644 --- 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 index cb02273b64..3c934287b4 100644 --- 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 index 2806d563ad..14c1cfc363 100644 --- 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