Skip to content

Commit 9f02d0b

Browse files
committed
Remove ci-testing from humble
1 parent 2e310c3 commit 9f02d0b

File tree

5 files changed

+3
-114
lines changed

5 files changed

+3
-114
lines changed

.docker/ci-testing/Dockerfile

Lines changed: 0 additions & 68 deletions
This file was deleted.

.docker/source/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Downloads the moveit source code and install remaining debian dependencies
55

66
ARG ROS_DISTRO=rolling
7-
FROM moveit/moveit2:${ROS_DISTRO}-ci-testing
7+
FROM moveit/moveit2:${ROS_DISTRO}-ci
88
LABEL maintainer Robert Haschke [email protected]
99

1010
# Export ROS_UNDERLAY for downstream docker containers

.github/workflows/ci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- IMAGE: humble-ci
2020
CCOV: true
2121
ROS_DISTRO: humble
22-
- IMAGE: humble-ci-testing
23-
ROS_DISTRO: humble
2422
IKFAST_TEST: true
2523
CLANG_TIDY: pedantic
2624
# Silent gmock/gtest warnings by picking more recent googletest version

.github/workflows/docker.yaml

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -97,49 +97,8 @@ jobs:
9797
${{ env.GH_IMAGE }}
9898
${{ env.DH_IMAGE }}
9999
100-
ci-testing:
101-
strategy:
102-
fail-fast: false
103-
matrix:
104-
ROS_DISTRO: [humble]
105-
runs-on: ubuntu-latest
106-
permissions:
107-
packages: write
108-
contents: read
109-
env:
110-
GH_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.ROS_DISTRO }}-${{ github.job }}
111-
DH_IMAGE: moveit/moveit2:${{ matrix.ROS_DISTRO }}-${{ github.job }}
112-
PUSH: ${{ (github.event_name != 'pull_request') && (github.repository == 'ros-planning/moveit2') }}
113-
114-
steps:
115-
- name: Set up Docker Buildx
116-
uses: docker/setup-buildx-action@v3
117-
- name: Login to Github Container Registry
118-
if: env.PUSH == 'true'
119-
uses: docker/login-action@v3
120-
with:
121-
registry: ghcr.io
122-
username: ${{ github.repository_owner }}
123-
password: ${{ secrets.GITHUB_TOKEN }}
124-
- name: Login to DockerHub
125-
if: env.PUSH == 'true'
126-
uses: docker/login-action@v3
127-
with:
128-
username: ${{ secrets.DOCKERHUB_USERNAME }}
129-
password: ${{ secrets.DOCKERHUB_TOKEN }}
130-
- name: Build and Push
131-
uses: docker/build-push-action@v5
132-
with:
133-
file: .docker/${{ github.job }}/Dockerfile
134-
build-args: OUR_ROS_DISTRO=${{ matrix.ROS_DISTRO }}
135-
push: ${{ env.PUSH }}
136-
no-cache: true
137-
tags: |
138-
${{ env.GH_IMAGE }}
139-
${{ env.DH_IMAGE }}
140-
141100
source:
142-
needs: ci-testing
101+
needs: ci
143102
strategy:
144103
fail-fast: false
145104
matrix:

.github/workflows/docker_lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
DOCKERFILE_PATH: [ci, ci-testing, release, source]
19+
DOCKERFILE_PATH: [ci, release, source]
2020

2121
name: Lint Dockerfiles
2222
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)