Temporarily switch to dockerhub for CI jobs (backport #1908)#2042
Closed
mergify[bot] wants to merge 1 commit intohumblefrom
Closed
Temporarily switch to dockerhub for CI jobs (backport #1908)#2042mergify[bot] wants to merge 1 commit intohumblefrom
mergify[bot] wants to merge 1 commit intohumblefrom
Conversation
Co-authored-by: Vatan Aksoy Tezer <vatan@picknik.ai> (cherry picked from commit 39d3714) # Conflicts: # .docker/ci-testing/Dockerfile # .github/workflows/ci.yaml
adlarkin
reviewed
Mar 24, 2023
Contributor
adlarkin
left a comment
There was a problem hiding this comment.
@vatanaksoytezer pinging you here just in case you want to take a look. We are trying to make CI green on the humble branch as well (see #2040)
Comment on lines
4
to
12
| ARG ROS_DISTRO=rolling | ||
| <<<<<<< HEAD | ||
| FROM osrf/ros2:testing | ||
| ======= | ||
| FROM moveit/moveit2:${ROS_DISTRO}-ci | ||
| >>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908)) | ||
| LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de | ||
|
|
||
| ENV TERM xterm |
Contributor
There was a problem hiding this comment.
Should this also incorporate the changes from #2035?
Suggested change
| ARG ROS_DISTRO=rolling | |
| <<<<<<< HEAD | |
| FROM osrf/ros2:testing | |
| ======= | |
| FROM moveit/moveit2:${ROS_DISTRO}-ci | |
| >>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908)) | |
| LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de | |
| ENV TERM xterm | |
| 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 |
Contributor
There was a problem hiding this comment.
If the changes from #2035 are made here as well, the corresponding github workflow build arg should be renamed to OUR_ROS_DISTRO: https://github.com/ros-planning/moveit2/blob/mergify/bp/humble/pr-1908/.github/workflows/docker.yaml#L134
Comment on lines
+34
to
+42
| <<<<<<< HEAD | ||
| DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }} | ||
| UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) | ||
| ======= | ||
| DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} | ||
| UPSTREAM_WORKSPACE: > | ||
| moveit2.repos | ||
| $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) | ||
| >>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908)) |
Contributor
There was a problem hiding this comment.
Suggested change
| <<<<<<< HEAD | |
| DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }} | |
| UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) | |
| ======= | |
| DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} | |
| UPSTREAM_WORKSPACE: > | |
| moveit2.repos | |
| $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) | |
| >>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908)) | |
| DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} | |
| UPSTREAM_WORKSPACE: > | |
| moveit2.repos | |
| $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) |
Contributor
|
@adlarkin thank you for the ping. Please feel free to close this and open a new PR with the changes you want. I might not have time to look at this in the next few days. (Sorry extremely busy week) |
Contributor
|
No worries, sorry for the delay on my end as well - I have just opened a replacement PR and will close this one: see #2081 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #1908 done by Mergify.
Cherry-pick of 39d3714 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com