Browse Source

Caching from docker as well

tempestpy_adaptions
Matthias Volk 8 years ago
parent
commit
dcedea5a08
  1. 6
      .travis.yml
  2. 1
      travis/dockerfiles/common_install.sh
  3. 9
      travis/postsubmit.sh

6
.travis.yml

@ -17,7 +17,9 @@ matrix:
travis/install_linux.sh travis/install_linux.sh
os: linux os: linux
script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10'; script: export OS=linux; export COMPILER='gcc-6'; export LINUX='ubuntu-16.10';
timeout 2400 travis/postsubmit.sh DebugPlain
travis/postsubmit.sh DebugPlain
before_cache:
docker cp storm:/storm .
# - compiler: gcc # - compiler: gcc
# env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain # env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain
# install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh # install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
@ -58,7 +60,7 @@ matrix:
os: osx os: osx
osx_image: xcode8 osx_image: xcode8
script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++'; script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
gtimeout 2400 travis/postsubmit.sh DebugPlain
travis/postsubmit.sh DebugPlain
# - compiler: clang # - compiler: clang
# env: COMPILER=clang-default STL=libc++ TEST=DebugPlain # env: COMPILER=clang-default STL=libc++ TEST=DebugPlain
# install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; # install: export OS=osx; export COMPILER='clang-default'; export STL='libc++';

1
travis/dockerfiles/common_install.sh

@ -5,6 +5,7 @@ set -e
apt-get update -qq apt-get update -qq
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
build-essential \
ruby \ ruby \
git \ git \
cmake \ cmake \

9
travis/postsubmit.sh

@ -4,6 +4,7 @@
set -e set -e
: ${N_JOBS:=2} : ${N_JOBS:=2}
: ${TIMEOUT:=400}
if [ "$STL" != "" ] if [ "$STL" != "" ]
then then
@ -13,12 +14,16 @@ fi
case $OS in case $OS in
linux) linux)
# Execute docker image on linux # Execute docker image on linux
# Stop previous session
docker rm -f storm &>/dev/null || true docker rm -f storm &>/dev/null || true
# Run container
docker run -d -it --name storm --privileged mvolk/storm-basesystem:$LINUX docker run -d -it --name storm --privileged mvolk/storm-basesystem:$LINUX
# Copy local content into container
docker exec storm mkdir storm docker exec storm mkdir storm
docker cp . storm:/storm docker cp . storm:/storm
docker exec storm bash -c "
# Execute main process
timeout $TIMEOUT docker exec storm bash -c "
export COMPILER=$COMPILER; export COMPILER=$COMPILER;
export N_JOBS=$N_JOBS; export N_JOBS=$N_JOBS;
export STLARG=$STLARG; export STLARG=$STLARG;
@ -34,7 +39,7 @@ osx)
export N_JOBS export N_JOBS
export STLARG export STLARG
export OS export OS
travis/postsubmit-helper.sh "$1"
gtimeout $TIMEOUT travis/postsubmit-helper.sh "$1"
exit $? exit $?
;; ;;

Loading…
Cancel
Save