Commit 5e29309a authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Merge branch 'devel' into future

parents fb7204e0 8c51fb0a
Setup
-----
1 Checkout the branch you are interested in.
2 From the root of the repository, run (update version number and branch)
```
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:14.04 -f .dockers/ubuntu-14.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04 -f .dockers/ubuntu-14.04/Dockerfile.premade .
```
3. Push the docker image:
```
# Eventually, login before push
# docker login eur0c.laas.fr
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04
```
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04 -f .dockers/ubuntu-16.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04 -f .dockers/ubuntu-16.04/Dockerfile.premade .
docker login eur0c.laas.fr:4567
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
FROM ubuntu:14.04
RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list
RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
RUN apt-get update -qqy && apt-get install -qqy \
autoconf \
asciidoc \
bison \
cmake \
flex \
git \
g++ \
libassimp-dev \
libboost-all-dev \
liblog4cxx10-dev \
libltdl-dev \
libomniorb4-dev \
libopenscenegraph-dev \
libqt4-opengl-dev \
libqtgui4 \
libtinyxml2-dev \
liburdfdom-dev \
make \
omniidl \
omniidl-python \
omniorb-nameserver \
oxygen-icon-theme \
python-matplotlib \
qt4-dev-tools \
ros-indigo-xacro \
ros-indigo-kdl-parser \
ros-indigo-common-msgs \
ros-indigo-tf \
ros-indigo-tf-conversions \
ros-indigo-libccd \
ros-indigo-octomap \
ros-indigo-resource-retriever \
ros-indigo-srdfdom \
ros-indigo-pr2-description \
source-highlight \
wget \
&& apt-get remove -qqy texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -qqy \
&& rm -rf /var/lib/apt/lists/*
COPY auto-install-hpp.sh /
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:14.04
ENV DEVEL_DIR /workspace
RUN /auto-install-hpp.sh --branch ubuntu-14.04 --target \
"doxygen-1.8.10.install \
OpenSceneGraph-dae-plugin.install \
qpOASES.install \
eigen3.install \
roboptim-trajectory.install"
FROM ubuntu:16.04
RUN apt-get update -qqy && apt-get install -qqy \
curl \
&& rm -rf /var/lib/apt/lists/*
RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list
RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
......@@ -46,6 +50,8 @@ RUN apt-get install -qqy \
libopenscenegraph-dev \
openscenegraph \
libpcre3-dev \
&& apt-get remove -qqy texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -qqy \
&& rm -rf /var/lib/apt/lists/*
COPY script/auto-install-hpp.sh /
COPY auto-install-hpp.sh /
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:16.04
<<<<<<< HEAD
RUN export DEVEL_HPP_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch master --target OpenSceneGraph-dae-plugin.install
RUN export DEVEL_HPP_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch master --target qpOASES.install
RUN export DEVEL_HPP_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch master --target roboptim-trajectory-3.1.install
RUN export DEVEL_HPP_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
mv $DEVEL_HPP_DIR /clean_workspace
ENV DEVEL_HPP_DIR /workspace
RUN /auto-install-hpp.sh --branch master --target OpenSceneGraph-dae-plugin.install
RUN /auto-install-hpp.sh --branch master --target qpOASES.install
RUN /auto-install-hpp.sh --branch master --target roboptim-trajectory.install
variables:
GIT_SSL_NO_VERIFY: "true"
GIT_SUBMODULE_STRATEGY: "recursive"
DEVEL_HPP_DIR: "$CI_PROJECT_DIR/workspace"
DEVEL_HPP_DIR: "/workspace"
BUILD_TYPE: "Release"
.build_template: &build_definition
stage: build
script:
- export INSTALL_DOCUMENTATION=OFF
- cp -r /clean_workspace $DEVEL_HPP_DIR
- $CI_PROJECT_DIR/script/auto-install-hpp.sh --branch ${CI_COMMIT_REF_NAME} --gitrepo https://gepgitlab.laas.fr/humanoid-path-planner/hpp-doc/raw --target test-ci
- $CI_PROJECT_DIR/script/auto-install-hpp.sh --branch ${CI_COMMIT_REF_NAME} --gitrepo ${CI_PROJECT_URL}/raw --target test-ci
- mv $DEVEL_HPP_DIR $CI_PROJECT_DIR
artifacts:
expire_in: 1 day
when: always
......@@ -19,25 +19,28 @@ variables:
.test_template: &test_definition
stage: test
script:
- rm -rf /workspace
- mv workspace /
- status=0
- echo -e "#!/bin/bash\nsource $DEVEL_HPP_DIR/config.sh\ncd $DEVEL_HPP_DIR/src/\$1/build-rel && make CTEST_OUTPUT_ON_FAILURE=1 test" > $DEVEL_HPP_DIR/test.sh || status=1
- echo -e "#!/bin/bash\nsource $DEVEL_HPP_DIR/config.sh\ncd $DEVEL_HPP_DIR/src/\$1/build-rel && make CTEST_OUTPUT_ON_FAILURE=1 test" > $DEVEL_HPP_DIR/test.sh || status=1
- cat $DEVEL_HPP_DIR/test.sh
- set +e
- chmod u+x $DEVEL_HPP_DIR/test.sh
- $DEVEL_HPP_DIR/test.sh hpp-util || status=1
- $DEVEL_HPP_DIR/test.sh hpp-fcl || status=1
- $DEVEL_HPP_DIR/test.sh hpp-pinocchio || status=1
- $DEVEL_HPP_DIR/test.sh hpp-statistics || status=1
- $DEVEL_HPP_DIR/test.sh hpp-constraints || status=1
- $DEVEL_HPP_DIR/test.sh hpp-core || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-corbaserver || status=1
- $DEVEL_HPP_DIR/test.sh hpp-manipulation || status=1
- $DEVEL_HPP_DIR/test.sh hpp-manipulation-urdf || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-manipulation-corba || status=1
- $DEVEL_HPP_DIR/test.sh hpp-walkgen || status=1
- $DEVEL_HPP_DIR/test.sh hpp-wholebody-step || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-wholebody-step-corba || status=1
- $DEVEL_HPP_DIR/test.sh hpp-util || status=1
- $DEVEL_HPP_DIR/test.sh hpp-fcl || status=1
- $DEVEL_HPP_DIR/test.sh hpp-pinocchio || status=1
- $DEVEL_HPP_DIR/test.sh hpp-statistics || status=1
- $DEVEL_HPP_DIR/test.sh hpp-constraints || status=1
- $DEVEL_HPP_DIR/test.sh hpp-core || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-corbaserver || status=1
- $DEVEL_HPP_DIR/test.sh hpp-manipulation || status=1
- $DEVEL_HPP_DIR/test.sh hpp-manipulation-urdf || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-manipulation-corba || status=1
- $DEVEL_HPP_DIR/test.sh hpp-walkgen || status=1
- $DEVEL_HPP_DIR/test.sh hpp-wholebody-step || status=1
#- $DEVEL_HPP_DIR/test.sh hpp-wholebody-step-corba || status=1
- set -e
- mv $DEVEL_HPP_DIR $CI_PROJECT_DIR
- exit $status
allow_failure: true
artifacts:
......@@ -49,6 +52,8 @@ variables:
.doc_template: &doc_definition
stage: deploy
script:
- rm -rf /workspace
- mv workspace /
- echo -e "#!/bin/bash\nsource $DEVEL_HPP_DIR/config.sh\nmake -C $DEVEL_HPP_DIR/src -s all" > $DEVEL_HPP_DIR/doc.sh
- cat $DEVEL_HPP_DIR/doc.sh
- chmod u+x $DEVEL_HPP_DIR/doc.sh
......@@ -56,6 +61,7 @@ variables:
#- make -C $DEVEL_HPP_DIR/src -s all
- $DEVEL_HPP_DIR/doc.sh
- tar czf ${DEVEL_HPP_DIR}/hpp.${CI_COMMIT_REF_NAME}.`date +"%Y%m%d"`.tar.gz $DEVEL_HPP_DIR/install/share/doc
- mv $DEVEL_HPP_DIR $CI_PROJECT_DIR
allow_failure: true
artifacts:
expire_in: 1 day
......
......@@ -20,8 +20,12 @@ or [these instructions](doc/instructions.md).
## Build docker images for CI
```
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04 .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04 -f Dockerfile.premade .
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04
branch=$(git branch --no-color | grep \* | cut -d' ' -f2)
for ubuntu in 14.04 16.04
do
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./script
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./script
docker push eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu}
docker push eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu}
done
```
......@@ -200,7 +200,7 @@ all: hpp_tutorial.install hpp-gepetto-viewer.install
test-ci: baxter_common.install romeo.install universal_robot.install \
hpp-environments.install
${MAKE} hpp_tutorial.install hpp-gepetto-viewer.install \
hpp_universal_robot.install; \
hpp_universal_robot.install && \
${MAKE} hpp-doc.install
# For benchmark, install robot packages first
......@@ -280,8 +280,8 @@ OpenSceneGraph-3.4.0.configure.dep: collada-dom.install \
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep: ${OSG_PACKAGE}.install \
gepetto-viewer.checkout
gepetto-viewer-corba.configure.dep: gepetto-viewer.install pythonqt.install \
gepetto-viewer-corba.checkout
gepetto-viewer-corba.configure.dep: gepetto-viewer.install \
pythonqt.install gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep: gepetto-viewer-corba.install \
hpp-corbaserver.install \
hpp-gepetto-viewer.checkout
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment