From 52caccfb6a43587a60e672a753fdd95df2b8db12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Wed, 6 May 2020 18:40:55 +0200 Subject: [PATCH 1/5] added test for foxy --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a32158c68..27e81744b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ env: - ROS_DISTRO=melodic OS_NAME=debian OS_CODE_NAME=bionic EXPECT_EXIT_CODE=1 - ROS_DISTRO=melodic ROS_REPO=ros BUILDER=colcon AFTER_SCRIPT='rosenv && [ "$CMAKE_PREFIX_PATH" = "/root/target_ws/install/industrial_ci:/opt/ros/melodic" ]' - ROS_DISTRO=noetic TARGET_WORKSPACE='industrial_ci/mockups/industrial_ci_testpkg' + - ROS_DISTRO=foxy # External repositories - ROS_DISTRO=kinetic _EXTERNAL_REPO='github:ros-industrial/industrial_core@kinetic-devel' From b0e9c5b1ea364947edd9db55c238491d6165e060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Wed, 6 May 2020 18:47:47 +0200 Subject: [PATCH 2/5] do not pass --rosdistro to rosdep if ROSDISTRO_INDEX_URL is set --- industrial_ci/src/workspace.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh index f83c7ee34..4ad93684e 100644 --- a/industrial_ci/src/workspace.sh +++ b/industrial_ci/src/workspace.sh @@ -217,7 +217,10 @@ function ici_setup_rosdep { ici_asroot rosdep init fi - update_opts=(--rosdistro "$ROS_DISTRO") + update_opts=() + if [ -z "$ROSDISTRO_INDEX_URL" ]; then + update_opts+=(--rosdistro "$ROS_DISTRO") + fi if [ "$ROS_VERSION_EOL" = true ]; then update_opts+=(--include-eol-distros) fi From 2c385a80eb98c0c0be6740a985c473e7ffe3e1f0 Mon Sep 17 00:00:00 2001 From: Chen Bainian Date: Mon, 4 May 2020 19:03:01 +0800 Subject: [PATCH 3/5] Fix new shellcheck error Signed-off-by: Chen Bainian --- industrial_ci/src/util.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/industrial_ci/src/util.sh b/industrial_ci/src/util.sh index 16b0b6445..beb7d32de 100644 --- a/industrial_ci/src/util.sh +++ b/industrial_ci/src/util.sh @@ -254,6 +254,7 @@ function ici_retry { function ici_quiet { local out; out=$(mktemp) # shellcheck disable=SC2216 + # shellcheck disable=SC2260 "$@" &> "$out" | true # '|| err=$?' disables errexit local err=${PIPESTATUS[0]} if [ "$err" -ne 0 ]; then From 473edf8a2387dca41c83a3e150f971c0a3fcf72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Wed, 6 May 2020 22:24:45 +0200 Subject: [PATCH 4/5] use melodic image for prerelease if DOCKER_DEFAULT_IMAGE is unset --- .travis.yml | 1 + industrial_ci/src/tests/ros_prerelease.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27e81744b..28e0f4fc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ env: - ROS_DISTRO=melodic OS_NAME=debian OS_CODE_NAME=bionic EXPECT_EXIT_CODE=1 - ROS_DISTRO=melodic ROS_REPO=ros BUILDER=colcon AFTER_SCRIPT='rosenv && [ "$CMAKE_PREFIX_PATH" = "/root/target_ws/install/industrial_ci:/opt/ros/melodic" ]' - ROS_DISTRO=noetic TARGET_WORKSPACE='industrial_ci/mockups/industrial_ci_testpkg' + - ROS_DISTRO=noetic PRERELEASE=true - ROS_DISTRO=foxy # External repositories diff --git a/industrial_ci/src/tests/ros_prerelease.sh b/industrial_ci/src/tests/ros_prerelease.sh index feab5d79c..81a2f079a 100644 --- a/industrial_ci/src/tests/ros_prerelease.sh +++ b/industrial_ci/src/tests/ros_prerelease.sh @@ -71,7 +71,7 @@ function run_ros_prerelease() { if [ -n "$CCACHE_DIR" ]; then opts+=(-v "$CCACHE_DIR:$WORKSPACE/home/.ccache") fi - DOCKER_RUN_OPTS="${opts[*]}" DOCKER_IMAGE=${DOCKER_IMAGE:-ros:$ROS_DISTRO-ros-core} ici_require_run_in_docker + DOCKER_RUN_OPTS="${opts[*]}" DOCKER_IMAGE=${DOCKER_DEFAULT_IMAGE:-ros:melodic-ros-core} ici_require_run_in_docker ici_run "setup_ros_prerelease" setup_ros_prerelease @@ -90,7 +90,7 @@ function run_ros_prerelease() { ici_run "prepare_prerelease_workspaces" prepare_prerelease_workspaces "$WORKSPACE" "$reponame" "$(basename "$TARGET_REPO_PATH")" ici_run 'generate_prerelease_script' sudo -EH -u ci generate_prerelease_script.py "${ROSDISTRO_INDEX_URL}" "$ROS_DISTRO" default "$OS_NAME" "$OS_CODE_NAME" "${OS_ARCH:-amd64}" --level "$downstream_depth" --output-dir "$WORKSPACE" --custom-repo "$reponame::::" - ABORT_ON_TEST_FAILURE=1 ici_run "run_prerelease_script" sudo -EH -u ci sh -c ". '/opt/ros/$ROS_DISTRO/setup.sh' && cd '$WORKSPACE' && exec ./prerelease.sh -y" + ABORT_ON_TEST_FAILURE=1 ici_run "run_prerelease_script" sudo -EH -u ci sh -c ". /opt/ros/*/setup.sh && cd '$WORKSPACE' && exec ./prerelease.sh -y" echo 'ROS Prerelease Test went successful.' } From 52ac2957708bf7dedbf85b99af7235e48e56717b Mon Sep 17 00:00:00 2001 From: Jannik Abbenseth Date: Tue, 12 May 2020 23:40:08 +0200 Subject: [PATCH 5/5] always use python3-vcstool (#509) --- industrial_ci/src/workspace.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh index 4ad93684e..b4b9b9d97 100644 --- a/industrial_ci/src/workspace.sh +++ b/industrial_ci/src/workspace.sh @@ -87,7 +87,7 @@ function ici_import_repository { local sourcespace=$1; shift local url=$1; shift - ici_install_pkgs_for_command vcs "${PYTHON_VERSION_NAME}-vcstool" + ici_install_pkgs_for_command vcs python3-vcstool IFS=" " read -r -a parts <<< "$(ici_resolve_scheme "$url")" # name, type, url, version @@ -111,7 +111,7 @@ function ici_import_file { bsdtar -C "$sourcespace" -xf "$file" ;; *) - ici_install_pkgs_for_command vcs "${PYTHON_VERSION_NAME}-vcstool" + ici_install_pkgs_for_command vcs python3-vcstool ici_setup_git_client ici_vcs_import "$sourcespace" < "$file" ;; @@ -132,7 +132,7 @@ function ici_import_url { processor=(bsdtar -C "$sourcespace" -xf-) ;; *) - ici_install_pkgs_for_command vcs "${PYTHON_VERSION_NAME}-vcstool" + ici_install_pkgs_for_command vcs python3-vcstool ici_setup_git_client processor=(ici_vcs_import "$sourcespace") ;;