Skip to content

Commit 5772acf

Browse files
author
Minggang Wang
committed
Temporarily diasble the cases for interaction test
As mentioned in issue 222 (#222), we disable these test cases on all ci platform. We will revert this patch, when the issue is fixed. This patch also added the dependencies for Rviz on circleci, as we build ros2 from scratch on it. Also, remove the node spacename for the cpp unit test. What's more, a new dependency named "Rviz" has been added to the ROS2.0 build which will triger the travis to exceed the maximum build time, so we decided to download the binary package to save the time.
1 parent 20e977b commit 5772acf

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ RUN locale-gen en_US en_US.UTF-8 && update-locale LC_ALL=en_US.UTF-8 LANG=en_US.
1212
RUN /bin/bash -c 'echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list' \
1313
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
1414

15-
RUN apt-get update && apt-get install -y build-essential cppcheck cmake libopencv-dev libpoco-dev libpocofoundation9v5 \
16-
libpocofoundation9v5-dbg python-empy python3-dev python3-empy python3-nose python3-pip python3-pyparsing python3-setuptools python3-vcstool libtinyxml-dev libeigen3-dev
15+
RUN apt-get update && apt-get install -y build-essential cppcheck cmake libopencv-dev \
16+
python-empy python3-dev python3-empy python3-nose python3-pip python3-pyparsing python3-setuptools python3-vcstool libtinyxml-dev libeigen3-dev
17+
18+
# dependencies for RViz
19+
RUN apt-get install -y libcurl4-openssl-dev libqt5core5a libqt5gui5 libqt5opengl5 libqt5widgets5 libxaw7-dev libgles2-mesa-dev libglu1-mesa-dev qtbase5-dev
1720

1821
# Dependencies for testing
1922
RUN apt-get install -y clang-format pydocstyle pyflakes python3-coverage python3-mock python3-pep8 uncrustify \
@@ -26,18 +29,14 @@ RUN apt-get install -y libasio-dev libtinyxml2-dev
2629
RUN git config --global user.name $GIT_USER_NAME \
2730
&& git config --global user.email $GIT_USER_EMAIL
2831

29-
# Get ROS2 code and build
30-
ENV ROS2_WS=/root/ros2_ws
31-
32-
RUN mkdir -p $ROS2_WS/src
33-
32+
# Get ROS2 latest package
33+
ENV ROS2_WS=/root
3434
WORKDIR $ROS2_WS
3535

36-
RUN wget https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos \
37-
&& vcs-import src < ros2.repos \
38-
&& src/ament/ament_tools/scripts/ament.py build --build-tests --symlink-install
36+
RUN wget http://ci.ros2.org/view/packaging/job/packaging_linux/lastSuccessfulBuild/artifact/ws/ros2-package-linux-x86_64.tar.bz2 \
37+
&& tar xf ros2-package-linux-x86_64.tar.bz2
3938

40-
RUN echo "source $ROS2_WS/install/local_setup.bash" >> $HOME/.bashrc
39+
RUN echo "source $ROS2_WS/ros2-linux/local_setup.bash" >> $HOME/.bashrc
4140

4241
# Install nvm, Node.js and node-gyp
4342
ENV NODE_VERSION v8.9.1

circle.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ dependencies:
1212
- brew install opencv
1313
- python3 -m pip install argcomplete coverage empy flake8 flake8-blind-except flake8-builtins flake8-class-newline flake8-comprehensions flake8-deprecated flake8-docstrings flake8-import-order flake8-quotes mock nose pep8 pydocstyle pyflakes pyparsing pytest pytest-cov pytest-runner pyyaml setuptools vcstool
1414
- brew install opencv
15+
- brew install qt freetype
1516
- wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
1617
- nvm install v8.9.1
1718
- nvm alias default v8.9.1
18-
- export PATH=/usr/local/Cellar/numpy/1.13.1_1/libexec/nose/bin:$PATH && mkdir -p ~/ros2_ws/src && cd ~/ros2_ws && wget https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos && vcs import src < ros2.repos && src/ament/ament_tools/scripts/ament.py build --symlink-install
19+
- export CMAKE_PREFIX_PATH=/usr/local/opt/qt:$CMAKE_PREFIX_PATH && export PATH=/usr/local/Cellar/numpy/1.13.1_1/libexec/nose/bin:$PATH && mkdir -p ~/ros2_ws/src && cd ~/ros2_ws && wget https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos && vcs import src < ros2.repos && src/ament/ament_tools/scripts/ament.py build --symlink-install
1920

2021
override:
2122
- node --version && npm --version && rm -rf ./node_modules/

test/blacklist.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Linux": [],
3-
"Darwin": [],
4-
"Windows_NT": []
2+
"Linux": ["test-cross-lang.js", "test-interactive.js", "test-multi-nodes.js"],
3+
"Darwin": ["test-cross-lang.js", "test-interactive.js", "test-multi-nodes.js"],
4+
"Windows_NT": ["test-cross-lang.js", "test-interactive.js", "test-multi-nodes.js"]
55
}

test/cpp/publisher_msg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ int main(int argc, char* argv[]) {
7373

7474
rclcpp::init(argc, argv);
7575

76-
auto node = rclcpp::node::Node::make_shared("cpp_publisher");
76+
auto node = rclcpp::Node::make_shared("cpp_publisher");
7777

7878
rmw_qos_profile_t custom_qos_profile = rmw_qos_profile_default;
7979
custom_qos_profile.depth = 7;

0 commit comments

Comments
 (0)