Skip to content

Commit

Permalink
Merge branch 'master' into pr-coverage
Browse files Browse the repository at this point in the history
Signed-off-by: Chen Bainian <[email protected]>
  • Loading branch information
Briancbn committed May 17, 2020
2 parents bdeda7e + 52ac295 commit 28e3042
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ 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
- ROS_DISTRO=kinetic _EXTERNAL_REPO='github:ros-industrial/industrial_core@kinetic-devel'
Expand Down
4 changes: 2 additions & 2 deletions industrial_ci/src/tests/ros_prerelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.'
}
11 changes: 7 additions & 4 deletions industrial_ci/src/workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
;;
Expand All @@ -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")
;;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 28e3042

Please sign in to comment.