From 59d22fd65b61a34f88ef5392f55236b2b22eed5b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 10:08:14 +0100 Subject: [PATCH] Include testing packages on CI (#223) (#224) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero (cherry picked from commit 42a34daea74325443b6dfa759724f099b3c4e3af) Co-authored-by: Alejandro Hernández Cordero --- .github/workflows/ci-iron.yaml | 15 ++++++++++++++- .github/workflows/ci-rolling.yaml | 15 ++++++++++++++- ...osition.yaml => cart_controller_position.yaml} | 0 3 files changed, 28 insertions(+), 2 deletions(-) rename gz_ros2_control_tests/config/{cartpole_controller_position.yaml => cart_controller_position.yaml} (100%) diff --git a/.github/workflows/ci-iron.yaml b/.github/workflows/ci-iron.yaml index d8408142..c6993d08 100644 --- a/.github/workflows/ci-iron.yaml +++ b/.github/workflows/ci-iron.yaml @@ -10,18 +10,31 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - docker-image: "ubuntu:22.04" gz-version: "fortress" ros-distro: "iron" + ros-repo-packages: "" - docker-image: "ubuntu:22.04" gz-version: "garden" ros-distro: "iron" + ros-repo-packages: "" + - docker-image: "ubuntu:22.04" + gz-version: "fortress" + ros-distro: "iron" + ros-repo-packages: "-testing" + - docker-image: "ubuntu:22.04" + gz-version: "garden" + ros-distro: "iron" + ros-repo-packages: "-testing" + env: DOCKER_IMAGE: ${{ matrix.docker-image }} GZ_VERSION: ${{ matrix.gz-version }} ROS_DISTRO: ${{ matrix.ros-distro }} + ROS_REPO_PACKAGES: ${{ matrix.ros-repo-packages }} container: image: ${{ matrix.docker-image }} steps: @@ -40,7 +53,7 @@ jobs: fi cp -r gz_ros2_control /home/ros2_ws/src/ curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2$ROS_REPO_PACKAGES/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null if [ "$GZ_VERSION" == "garden" ]; then diff --git a/.github/workflows/ci-rolling.yaml b/.github/workflows/ci-rolling.yaml index 47d4b053..f19e156d 100644 --- a/.github/workflows/ci-rolling.yaml +++ b/.github/workflows/ci-rolling.yaml @@ -10,18 +10,31 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - docker-image: "ubuntu:22.04" gz-version: "fortress" ros-distro: "rolling" + ros-repo-packages: "" - docker-image: "ubuntu:22.04" gz-version: "garden" ros-distro: "rolling" + ros-repo-packages: "" + - docker-image: "ubuntu:22.04" + gz-version: "fortress" + ros-distro: "rolling" + ros-repo-packages: "-testing" + - docker-image: "ubuntu:22.04" + gz-version: "garden" + ros-distro: "rolling" + ros-repo-packages: "-testing" + env: DOCKER_IMAGE: ${{ matrix.docker-image }} GZ_VERSION: ${{ matrix.gz-version }} ROS_DISTRO: ${{ matrix.ros-distro }} + ROS_REPO_PACKAGES: ${{ matrix.ros-repo-packages }} container: image: ${{ matrix.docker-image }} steps: @@ -40,7 +53,7 @@ jobs: fi cp -r gz_ros2_control /home/ros2_ws/src/ curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2$ROS_REPO_PACKAGES/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null if [ "$GZ_VERSION" == "garden" ]; then diff --git a/gz_ros2_control_tests/config/cartpole_controller_position.yaml b/gz_ros2_control_tests/config/cart_controller_position.yaml similarity index 100% rename from gz_ros2_control_tests/config/cartpole_controller_position.yaml rename to gz_ros2_control_tests/config/cart_controller_position.yaml