Skip to content

Commit

Permalink
Update distros in tests (#828)
Browse files Browse the repository at this point in the history 
Signed-off-by: Christophe Bedard <christophe.bedard@apex.ai>
  • Loading branch information
@christophebedard
christophebedard authored Jul 18, 2023
1 parent 995de1c commit c9e8081
Showing 1 changed file with 33 additions and 47 deletions.
80 changes: 33 additions & 47 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
fail-fast: false
matrix:
ros_distribution: # ROS 1 tests only run on Ubuntu
- melodic
- noetic

# Define the Docker image(s) associated with each ROS distribution.
Expand All @@ -42,10 +41,6 @@ jobs:
#
# Platforms are defined in REP 3: https://ros.org/reps/rep-0003.html
include:
# Melodic Morenia (May 2018 - May 2023)
- docker_image: rostooling/setup-ros-docker:ubuntu-bionic-ros-melodic-ros-base-latest
ros_distribution: melodic

# Noetic Ninjemys (May 2020 - May 2025)
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-noetic-ros-base-latest
ros_distribution: noetic
Expand Down Expand Up @@ -74,7 +69,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-latest, windows-2019]
ros_distribution: [foxy, humble]
ros_distribution: [humble, iron]
env:
INSTALL_TYPE: ${{ matrix.os == 'windows-2019' && 'merged' || 'default' }}
INSTALL_PATH: ${{ matrix.os == 'windows-2019' && 'install/share' || 'install' }}
Expand All @@ -97,37 +92,36 @@ jobs:
run: test -d "${{ steps.test_all_packages_in_repo.outputs.ros-workspace-directory-name }}/${{ env.INSTALL_PATH }}/osrf_testing_tools_cpp"
- name: "Check that test_osrf_testing_tools_cpp install directory is present in ${{ env.INSTALL_TYPE }} install space"
run: test -d "${{ steps.test_all_packages_in_repo.outputs.ros-workspace-directory-name }}/${{ env.INSTALL_PATH }}/test_osrf_testing_tools_cpp"


test_ros2_foxy_package_with_dependencies:
name: "Test ROS 2 foxy package with ROS dependencies"
runs-on: ubuntu-20.04
test_ros2_humble_package_with_dependencies:
name: "Test ROS 2 humble package with ROS dependencies"
runs-on: ubuntu-22.04
needs: pre_condition
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@master
with:
required-ros-distributions: foxy
required-ros-distributions: humble
- uses: ./
with:
package-name: rmw
target-ros2-distro: foxy
target-ros2-distro: humble
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_cpp_with_dependency.repos"

test_ros2_foxy_rosdep_skip_keys:
test_ros2_humble_rosdep_skip_keys:
name: "Test with rosdep-skip-keys option"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: pre_condition
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@master
with:
required-ros-distributions: foxy
required-ros-distributions: humble
# Skip installing test_depend dependency and verifies it isn't installed.
- uses: ./
with:
package-name: rmw
target-ros2-distro: foxy
target-ros2-distro: humble
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_cpp_with_dependency.repos"
extra-cmake-args: -DBUILD_TESTING=Off
skip-tests: true
Expand All @@ -136,33 +130,33 @@ jobs:
run: sudo apt -y install dpkg
- name: "Verify dependencies were skipped"
run: |
[[ $(dpkg -s ros-foxy-osrf-testing-tools-cpp) -eq 0 ]]
[[ $(dpkg -s ros-humble-osrf-testing-tools-cpp) -eq 0 ]]
# Install dependencies as usual and verifies it is now installed.
- uses: ./
with:
package-name: rmw
target-ros2-distro: foxy
target-ros2-distro: humble
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_cpp_with_dependency.repos"
- name: "Verify dependencies weren't skipped"
run: |
dpkg -s ros-foxy-osrf-testing-tools-cpp
dpkg -s ros-humble-osrf-testing-tools-cpp
test_private_repo:
name: "Test with private repos"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: pre_condition
# We don't have access to the secret token for the test repo on a fork
if: ${{ !github.event.repository.fork && !github.event.pull_request.head.repo.fork }}
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@master
with:
required-ros-distributions: foxy
required-ros-distributions: humble
- uses: ./
with:
import-token: ${{ secrets.TOKEN_PRIVATE_REPO_TEST }}
package-name: simple_package
target-ros2-distro: foxy
target-ros2-distro: humble
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_private_repo.repos"

test_ros2_docker:
Expand All @@ -173,23 +167,24 @@ jobs:
fail-fast: false
matrix:
ros_distribution:
- foxy
# - humble
- humble
- iron
- rolling
# Define the Docker image(s) associated with each ROS distribution.
# The include syntax allows additional variables to be defined, like
# docker_image in this case. See documentation:
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-configurations-in-a-matrix-build
#
# Platforms are defined in REP 2000: https://ros.org/reps/rep-2000.html
include:
# Foxy Fitzroy (May 2020 - May 2023)
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
ros_distribution: foxy

# Humble Hawksbill (May 2022 - May 2027)
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
ros_distribution: humble

# Iron Irwini (May 2023 - November 2024)
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
ros_distribution: iron

# Rolling Ridley (see REP 2002: https://www.ros.org/reps/rep-2002.html)
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
ros_distribution: rolling
Expand Down Expand Up @@ -228,19 +223,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macOS-latest, windows-2019, ubuntu-20.04, ubuntu-22.04]
ros_distribution: [foxy, humble, iron, rolling]
exclude:
- os: ubuntu-22.04
ros_distribution: foxy
- os: ubuntu-20.04
ros_distribution: humble
- os: ubuntu-20.04
ros_distribution: iron
- os: ubuntu-20.04
ros_distribution: rolling
os: [macOS-latest, windows-2019, ubuntu-22.04]
ros_distribution: [humble, iron, rolling]
env:
DISTRO_REPOS_URL: "https://raw.githubusercontent.com/ros2/ros2/${{ matrix.ros_distribution == 'rolling' && 'master' || matrix.ros_distribution }}/ros2.repos"
DISTRO_REPOS_URL: "https://raw.githubusercontent.com/ros2/ros2/${{ matrix.ros_distribution }}/ros2.repos"
INSTALL_TYPE: ${{ matrix.os == 'windows-2019' && 'merged' || 'default' }}
INSTALL_PATH: ${{ matrix.os == 'windows-2019' && 'install/share' || 'install' }}
steps:
Expand Down Expand Up @@ -398,8 +384,8 @@ jobs:
fail-fast: false
matrix:
ros_distribution:
- foxy
- humble
- iron
- rolling

# Define the Docker image(s) associated with each ROS distribution.
Expand All @@ -409,20 +395,20 @@ jobs:
#
# Platforms are defined in REP 2000: https://ros.org/reps/rep-2000.html
include:
# Foxy Fitzroy (May 2020 - May 2023)
- docker_image: ubuntu:focal
ros_distribution: foxy
distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/foxy/ros2.repos

# Humble Hawksbill (May 2022 - May 2027)
- docker_image: ubuntu:jammy
ros_distribution: humble
distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos

# Iron Irwini (May 2023 - November 2024)
- docker_image: ubuntu:jammy
ros_distribution: iron
distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/iron/ros2.repos

# Rolling Ridley (see REP 2002: https://www.ros.org/reps/rep-2002.html)
- docker_image: ubuntu:jammy
ros_distribution: rolling
distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos
distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos
container:
image: ${{ matrix.docker_image }}
steps:
Expand Down

0 comments on commit c9e8081

Please sign in to comment.