Use external pre-baked docker image for fedora tests to speed them up

This commit is contained in:
Cyryl Płotnicki 2016-09-19 20:16:14 +02:00
parent 005b00b1a6
commit 848608ea29
3 changed files with 23 additions and 17 deletions

View file

@ -5,7 +5,7 @@ script:
- ./test - ./test
env: env:
- DETECTED_OS=fedora:24 - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base NO_COMPILE_VIM=true
- DETECTED_OS=debian:jessie NOUPGRADE=true - DETECTED_OS=debian:jessie NOUPGRADE=true
- DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:trusty
- DETECTED_OS=ubuntu:xenial - DETECTED_OS=ubuntu:xenial

View file

@ -25,21 +25,23 @@ if [[ -z $NO_SYSTEMCTL ]]; then
sudo systemctl list-timers "*dnf-*" sudo systemctl list-timers "*dnf-*"
fi fi
VIM_BUILD_DIR=/tmp if [[ -z $NO_COMPILE_VIM ]]; then
cd "$VIM_BUILD_DIR" VIM_BUILD_DIR=/tmp
git clone https://github.com/vim/vim.git cd "$VIM_BUILD_DIR"
cd vim git clone https://github.com/vim/vim.git
./configure --with-features=huge \ cd vim
--enable-multibyte \ ./configure --with-features=huge \
--enable-rubyinterp \ --enable-multibyte \
--enable-python3interp=yes \ --enable-rubyinterp \
--enable-luainterp \ --enable-python3interp=yes \
--enable-gui=no \ --enable-luainterp \
--enable-cscope --enable-gui=no \
make -j2 --enable-cscope
sudo make install make -j2
cd sudo make install
rm -fvr "$VIM_BUILD_DIR/vim" cd
rm -fvr "$VIM_BUILD_DIR/vim"
fi
DIR="$DIR/../" DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system DIR="$DIR" $DIR/common/configure_fresh_system

6
test
View file

@ -25,5 +25,9 @@ else
DIR=$SYSTEM_DIR DIR=$SYSTEM_DIR
fi fi
docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider if [[ -z $DOCKER_IMAGE ]]; then
DOCKER_IMAGE="$DETECTED_OS"
fi
docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DOCKER_IMAGE $INSIDER_ROOT_DIR/$DIR/test_insider