Fix isolated pre-release tests for Ubuntu 22.04

ros-industrial · Jan 18, 2023 · cf30660 · cf30660
1 parent 116e037
commit cf30660
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,9 +35,7 @@ jobs:
 
           # - {ROS_DISTRO: indigo, PRERELEASE: true}  ## Comment out because this is meaningless for always failing without prerelease testable contents in industrial_ci.
 
-          - {ROS_DISTRO: melodic, PRERELEASE: true, PRERELEASE_DOWNSTREAM_DEPTH: 1}
-          - {ROS_DISTRO: melodic, PRERELEASE: true, TARGET_WORKSPACE: 'industrial_ci/mockups/failing_test', PRERELEASE_REPONAME: "failing_test", EXPECT_EXIT_CODE: 1}
-          - {ROS_DISTRO: melodic, PRERELEASE: true, PRERELEASE_REPONAME: industrial_ci}
+          - {ROS_DISTRO: noetic, PRERELEASE: true, TARGET_WORKSPACE: 'industrial_ci/mockups/failing_test', PRERELEASE_REPONAME: "failing_test", EXPECT_EXIT_CODE: 1}
           - {ROS_DISTRO: kinetic, UPSTREAM_WORKSPACE: debian, AFTER_SCRIPT: 'ccache 2> /dev/null && exit 1; [ "$$?" = "127" ]'}
            # Using default file name for ROSINSTALL_FILENAME, test CCACHE, verify cache was filled
           - {ROS_DISTRO: kinetic, UPSTREAM_WORKSPACE: file, CCACHE_DIR: '/github/home/.ccache', AFTER_SCRIPT: 'num=($$(ccache -s | grep "files in cache")) && (( num[-1] > 0 ))'}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ cache:
 
 # enable docker-in-docker
 services:
-  - docker:19.03.5-dind
+  - docker:20.10.16-dind
 
 before_script:
   - apk add --update bash coreutils tar grep # install industrial_ci dependencies
@@ -35,11 +35,6 @@ indigo:
 kinetic:
   script: .industrial_ci/gitlab.sh ROS_DISTRO=kinetic  # alternate syntax
 
-melodic:
-  script: .industrial_ci/gitlab.sh
-  variables:
-    ROS_DISTRO: "melodic"
-    PRERELEASE: "true"
 
 noetic:
   image: ros:noetic
@@ -49,6 +44,14 @@ noetic:
   variables:
     ISOLATION: shell
 
+humble:
+  script: .industrial_ci/gitlab.sh
+  variables:
+    TARGET_WORKSPACE: ". github:ros-controls/control_msgs#galactic-devel"
+    ROS_DISTRO: "humble"
+    PRERELEASE: "true"
+    CCACHE_DIR:
+
 dashing:
   script: .industrial_ci/gitlab.sh ROS_DISTRO=dashing
 

diff --git a/industrial_ci/src/tests/ros_prerelease.sh b/industrial_ci/src/tests/ros_prerelease.sh
@@ -98,7 +98,6 @@ function prepare_ros_prerelease() {
       CCACHE_DIR= # prevent cachedir from beeing added twice
     fi
     export DOCKER_IMAGE=${DOCKER_IMAGE:-ros:noetic-ros-core}
-    export ROS_DISTRO=noetic
 }
 
 function run_ros_prerelease() {