diff --git a/.travis.yml b/.travis.yml index 36fc318e..efdb686e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ before_script: script: - if [ "${IS_EUSLISP_TRAVIS_TEST}" != "true" ] ; then export ROS_PARALLEL_JOBS="-j2 -l2" ; fi - if [ "${ROS_DISTRO}" == "hydro" ] ; then sudo apt-get install -y --force-yes gdebi && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-tools_0.3.1-1_all.deb && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-tools_0.3.1-1_all.deb && sudo apt-mark hold python-catkin-tools; fi - - if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else docker pull $DOCKER_IMAGE || true; export CI_SOURCE_PATH=$(pwd); docker run -v $HOME:$HOME -v $HOME/.ccache:$HOME/.ccache/ -v $HOME/.cache/pip:$HOME/.cache/pip/ $DOCKER_XSERVER_OPTIONS -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_JOB_ID -e TRAVIS_OS_NAME -e TRAVIS_PULL_REQUEST -e TRAVIS_REPO_SLUG -e GITHUB_RUN_ID -e CI_SOURCE_PATH -e HOME -e REPOSITORY_NAME -e BUILD_PKGS -e TARGET_PKGS -e TEST_PKGS -e BEFORE_SCRIPT -e BUILDER -e EXTRA_DEB -e USE_DEB -e ROS_DISTRO -e ROS_LOG_DIR -e ROS_REPOSITORY_PATH -e ROSWS -e CATKIN_TOOLS_BUILD_OPTIONS -e CATKIN_TOOLS_CONFIG_OPTIONS -e CATKIN_PARALLEL_JOBS -e CATKIN_PARALLEL_TEST_JOBS -e ROS_PARALLEL_JOBS -e ROS_PARALLEL_TEST_JOBS -e ROS_PYTHON_VERSION -e ROSDEP_ADDITIONAL_OPTIONS -e ROSDEP_UPDATE_QUIET -e SUDO_PIP -e USE_PYTHON_VIRTUALENV -e NOT_TEST_INSTALL -e DEBUG_TRAVIS_PYTHON -t $DOCKER_IMAGE bash -c 'cd $CI_SOURCE_PATH; source ./.travis_test.sh' ; fi + - if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else docker pull $DOCKER_IMAGE || true; export CI_SOURCE_PATH=$(pwd); docker run -v $HOME:$HOME -v $HOME/.ccache:$HOME/.ccache/ -v $HOME/.cache/pip:$HOME/.cache/pip/ $DOCKER_XSERVER_OPTIONS -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_JOB_ID -e TRAVIS_OS_NAME -e TRAVIS_PULL_REQUEST -e TRAVIS_REPO_SLUG -e GITHUB_RUN_ID -e CI_SOURCE_PATH -e HOME -e REPOSITORY_NAME -e BUILD_PKGS -e TARGET_PKGS -e TEST_PKGS -e BEFORE_SCRIPT -e BUILDER -e EXTRA_DEB -e USE_DEB -e ROS_DISTRO -e ROS_LOG_DIR -e ROS_REPOSITORY_PATH -e ROSWS -e CATKIN_TOOLS_BUILD_OPTIONS -e CATKIN_TOOLS_CONFIG_OPTIONS -e CATKIN_PARALLEL_JOBS -e CATKIN_PARALLEL_TEST_JOBS -e ROS_PARALLEL_JOBS -e ROS_PARALLEL_TEST_JOBS -e ROS_PYTHON_VERSION -e ROSDEP_ADDITIONAL_OPTIONS -e ROSDEP_UPDATE_QUIET -e SUDO_PIP -e USE_PYTHON_VIRTUALENV -e NOT_TEST_INSTALL -e DEBUG_TRAVIS_PYTHON -e TEST_PACKAGE -e TEST_TYPE -t $DOCKER_IMAGE bash -c 'cd $CI_SOURCE_PATH; source ./.travis_test.sh' ; fi - ccache -s after_success: - if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then cd ${TRAVIS_BUILD_DIR}; openssl aes-256-cbc -K $encrypted_b79fc5843df3_key -iv $encrypted_b79fc5843df3_iv -in .secrets.tar.enc -out .secrets.tar -d; tar -C ~/ -xvf .secrets.tar; fi diff --git a/.travis_test.sh b/.travis_test.sh index b6702f13..b253ac45 100644 --- a/.travis_test.sh +++ b/.travis_test.sh @@ -11,6 +11,10 @@ function error { trap error ERR +# install fundamental packages +sudo -E apt-get -y -qq update +sudo -E apt-get -y -qq install apt-utils build-essential curl git lsb-release wget + # MongoDB hack dpkg -s mongodb || echo "ok"; export HAVE_MONGO_DB=$? if [ $HAVE_MONGO_DB == 0 ]; then sudo apt-get remove --purge -qq -y mongodb mongodb-10gen || echo "ok"; fi