* [tarantool-patches] travis-ci: changed the travis build routine to run tests in separate dockers
@ 2019-02-27 5:01 Alexander Tikhonov
2019-02-27 5:03 ` [tarantool-patches] " Alexander Tikhonov
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Tikhonov @ 2019-02-27 5:01 UTC (permalink / raw)
To: tarantool-patches, Alexander Turenko
[-- Attachment #1: Type: text/plain, Size: 10681 bytes --]
travis-ci: build each test in separate dockers
The build/test routines changed to be able to avoid
of influences between tests. For now the single build
process leaves the new image with prepared binaries
which is in use for testing routine in separate docker runs.
Fix #3863
---
Travis-ci:
Branch: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3863-run-cleaner
diff --git a/.travis.mk b/.travis.mk
index edd94cd7d..d88ceff62 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -13,37 +13,111 @@ package:
test: test_$(TRAVIS_OS_NAME)
# Redirect some targets via docker
-test_linux: docker_test_ubuntu
-coverage: docker_coverage_ubuntu
+test_linux:
+ TYPE=docker_test_ubuntu make -f .travis.mk docker_test_ubuntu
+coverage:
+ TYPE=docker_coverage_ubuntu make -f .travis.mk docker_coverage_ubuntu
-docker_%:
+docker_common:
mkdir -p ~/.cache/ccache
docker run \
- --rm=true --tty=true \
+ --tty=true \
--volume "${PWD}:/tarantool" \
- --volume "${HOME}/.cache:/cache" \
- --workdir /tarantool \
- -e XDG_CACHE_HOME=/cache \
- -e CCACHE_DIR=/cache/ccache \
+ --name built_container_${TRAVIS_JOB_ID} \
-e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
-e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
${DOCKER_IMAGE} \
- make -f .travis.mk $(subst docker_,,$@)
+ /bin/bash -c "cp -rfp /tarantool /tarantool_ws \
+ && cd /tarantool_ws \
+ && make -f .travis.mk $(subst docker_,,${TYPE}) \
+ || exit 1"
+ docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE}_tmp
+ docker commit built_container_${TRAVIS_JOB_ID} ${DOCKER_IMAGE}_tmp
+ docker rm -f built_container_${TRAVIS_JOB_ID}
+ cd test && suites=`ls -1 */suite.ini | sed 's#/.*##g'` ; cd .. ; \
+ passed=0 ; \
+ failed=0 ; \
+ for suite in $$suites ; do \
+ tests=`cd test/$$suite && ls -1 *.test.lua 2>/dev/null | sed 's#.test.lua##g'` ; \
+ for test in $$tests ; do \
+ TEST=$$suite/$$test.test ; \
+ docker run \
+ --rm=true --tty=true \
+ --volume "${PWD}:/tarantool" \
+ --workdir /tarantool_ws \
+ -e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
+ -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
+ -e TEST=$$TEST \
+ ${DOCKER_IMAGE}_tmp \
+ /bin/bash -c "make -s -f .travis.mk $(subst docker_,run_,${TYPE}) \
+ || exit 1" \
+ && passed=$$(($$passed+1)) \
+ || failed=$$(($$failed+1)) ; \
+ done ; \
+ done ; \
+ echo ; \
+ echo "Overall results:" ; \
+ echo "================" ; \
+ echo "Passed # of tested scenarious: $$passed" ; \
+ if [ "$$failed" -ne "0" ] ; then \
+ echo "Failed # of tests: $$failed" ; \
+ echo ------------------- ; \
+ grep '\[ fail \]' ${PWD}/test_*.log | sed 's#.*:##g' ; \
+ echo =================== ; \
+ echo ; \
+ false ; \
+ fi
+
+docker_test_ubuntu: docker_common
+ # post test stage
+ docker rmi -f ${DOCKER_IMAGE}_tmp
deps_ubuntu:
- sudo apt-get update && apt-get install -y -f \
+ sudo apt-get update \
+ >/tarantool/apt_update.log 2>&1 \
+ && echo "APT update PASSED" \
+ || ( echo "APT update FAILED" ; \
+ cat /tarantool/apt_update.log ; \
+ exit 1 )
+ sudo apt-get install -y -f \
build-essential cmake coreutils sed \
libreadline-dev libncurses5-dev libyaml-dev libssl-dev \
libcurl4-openssl-dev libunwind-dev libicu-dev \
python python-pip python-setuptools python-dev \
python-msgpack python-yaml python-argparse python-six python-gevent \
- lcov ruby
+ lcov ruby rsync \
+ >/tarantool/apt_install.log 2>&1 \
+ && echo "APT install PASSED" \
+ || ( echo "APT install FAILED" ; \
+ cat /tarantool/apt_install.log ; \
+ exit 1 )
test_ubuntu: deps_ubuntu
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError ${CMAKE_EXTRA_PARAMS}
- make -j8
- cd test && /usr/bin/python test-run.py -j 1
+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError ${CMAKE_EXTRA_PARAMS} \
+ >/tarantool/cmake.log 2>&1 \
+ && echo "CMAKE PASSED" \
+ || ( echo "CMAKE FAILED" ; \
+ cat /tarantool/cmake.log ; \
+ exit 1 )
+ make -j \
+ >/tarantool/make.log 2>&1 \
+ && echo "MAKE PASSED" \
+ || ( echo "MAKE FAILED" ; \
+ cat /tarantool/make.log ; \
+ exit 1 )
+run_test_ubuntu:
+ file="test_$(subst /,_,${TEST}).log" ; \
+ sfile="/tarantool_ws/$$file" ; \
+ cd test && /usr/bin/python test-run.py -j 1 ${TEST} \
+ >$$sfile 2>&1 \
+ && ( echo "TEST(${TEST}) PASSED" ; \
+ grep "Statistics:" -A1000 $$sfile | grep -v Statistics ) \
+ || ( echo "TEST(${TEST}) FAILED" ; \
+ cat $$file ; \
+ cp -f $$sfile /tarantool/. ; \
+ exit 1 )
+
deps_osx:
brew update
brew install openssl readline curl icu4c --force
@@ -66,10 +140,46 @@ test_osx: deps_osx
deactivate
coverage_ubuntu: deps_ubuntu
- cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
- make -j8
+ cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON \
+ >/tarantool/cmake.log 2>&1 \
+ && echo "CMAKE PASSED" \
+ || ( echo "CMAKE FAILED" ; \
+ cat /tarantool/cmake.log ; \
+ exit 1 )
+ make -j \
+ >/tarantool/make.log 2>&1 \
+ && echo "MAKE PASSED" \
+ || ( echo "MAKE FAILED" ; \
+ cat /tarantool/make.log ; \
+ exit 1 )
+
+run_coverage_ubuntu:
# Enable --long tests for coverage
- cd test && /usr/bin/python test-run.py -j 1 --long
+ file="test_$(subst /,_,${TEST}).log" ; \
+ sfile="/tarantool_ws/$$file" ; \
+ cd test && /usr/bin/python test-run.py -j 1 --long ${TEST} \
+ >$$file 2>&1 \
+ && ( rsync -uqr /tarantool_ws/src/ /tarantool/src >/dev/null 2>&1 ; \
+ echo "TEST(${TEST}) PASSED" ; \
+ grep "Statistics:" -A1000 $$file | grep -v Statistics ) \
+ || ( echo "TEST(${TEST}) FAILED" ; \
+ cat $$file ; \
+ cp -f $$sfile /tarantool/. ; \
+ exit 1 )
+
+docker_coverage_ubuntu: docker_common
+ # post test stage
+ docker run \
+ --rm=true --tty=true \
+ --volume "${PWD}:/tarantool" \
+ --workdir /tarantool \
+ -e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
+ -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
+ ${DOCKER_IMAGE}_tmp \
+ /bin/bash -c "make -f .travis.mk analyze_coverage_ubuntu || exit 1"
+ docker rmi -f ${DOCKER_IMAGE}_tmp
+
+analyze_coverage_ubuntu:
lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
--output-file coverage.info
@@ -79,7 +189,7 @@ coverage_ubuntu: deps_ubuntu
gem install coveralls-lcov; \
echo coveralls-lcov --service-name travis-ci --service-job-id $(TRAVIS_JOB_ID) --repo-token [FILTERED] coverage.info; \
coveralls-lcov --service-name travis-ci --service-job-id $(TRAVIS_JOB_ID) --repo-token $(COVERALLS_TOKEN) coverage.info; \
- fi;
+ fi
source:
git clone https://github.com/packpack/packpack.git packpack
--
Alexander Tikhonov
[-- Attachment #2: Type: text/html, Size: 20460 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tarantool-patches] Re: [tarantool-patches] travis-ci: changed the travis build routine to run tests in separate dockers
2019-02-27 5:01 [tarantool-patches] travis-ci: changed the travis build routine to run tests in separate dockers Alexander Tikhonov
@ 2019-02-27 5:03 ` Alexander Tikhonov
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Tikhonov @ 2019-02-27 5:03 UTC (permalink / raw)
To: tarantool-patches; +Cc: Alexander Turenko
[-- Attachment #1: Type: text/plain, Size: 11086 bytes --]
Added Travis-CI link
>Среда, 27 февраля 2019, 8:01 +03:00 от Alexander Tikhonov <avtikhon@tarantool.org>:
>
>travis-ci: build each test in separate dockers
>
>The build/test routines changed to be able to avoid
>of influences between tests. For now the single build
>process leaves the new image with prepared binaries
>which is in use for testing routine in separate docker runs.
>
>Fix #3863
>
>---
>
>Travis-ci: https://travis-ci.org/tarantool/tarantool/builds/498665499
>
>Branch: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3863-run-cleaner
>
>diff --git a/.travis.mk b/.travis.mk
>index edd94cd7d..d88ceff62 100644
>--- a/.travis.mk
>+++ b/.travis.mk
>@@ -13,37 +13,111 @@ package:
> test: test_$(TRAVIS_OS_NAME)
>
> # Redirect some targets via docker
>-test_linux: docker_test_ubuntu
>-coverage: docker_coverage_ubuntu
>+test_linux:
>+ TYPE=docker_test_ubuntu make -f .travis.mk docker_test_ubuntu
>+coverage:
>+ TYPE=docker_coverage_ubuntu make -f .travis.mk docker_coverage_ubuntu
>
>-docker_%:
>+docker_common:
> mkdir -p ~/.cache/ccache
> docker run \
>- --rm=true --tty=true \
>+ --tty=true \
> --volume "${PWD}:/tarantool" \
>- --volume "${HOME}/.cache:/cache" \
>- --workdir /tarantool \
>- -e XDG_CACHE_HOME=/cache \
>- -e CCACHE_DIR=/cache/ccache \
>+ --name built_container_${TRAVIS_JOB_ID} \
> -e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
> -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
> ${DOCKER_IMAGE} \
>- make -f .travis.mk $(subst docker_,,$@)
>+ /bin/bash -c "cp -rfp /tarantool /tarantool_ws \
>+ && cd /tarantool_ws \
>+ && make -f .travis.mk $(subst docker_,,${TYPE}) \
>+ || exit 1"
>+ docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE}_tmp
>+ docker commit built_container_${TRAVIS_JOB_ID} ${DOCKER_IMAGE}_tmp
>+ docker rm -f built_container_${TRAVIS_JOB_ID}
>+ cd test && suites=`ls -1 */suite.ini | sed 's#/.*##g'` ; cd .. ; \
>+ passed=0 ; \
>+ failed=0 ; \
>+ for suite in $$suites ; do \
>+ tests=`cd test/$$suite && ls -1 *.test.lua 2>/dev/null | sed 's#.test.lua##g'` ; \
>+ for test in $$tests ; do \
>+ TEST=$$suite/$$test.test ; \
>+ docker run \
>+ --rm=true --tty=true \
>+ --volume "${PWD}:/tarantool" \
>+ --workdir /tarantool_ws \
>+ -e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
>+ -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
>+ -e TEST=$$TEST \
>+ ${DOCKER_IMAGE}_tmp \
>+ /bin/bash -c "make -s -f .travis.mk $(subst docker_,run_,${TYPE}) \
>+ || exit 1" \
>+ && passed=$$(($$passed+1)) \
>+ || failed=$$(($$failed+1)) ; \
>+ done ; \
>+ done ; \
>+ echo ; \
>+ echo "Overall results:" ; \
>+ echo "================" ; \
>+ echo "Passed # of tested scenarious: $$passed" ; \
>+ if [ "$$failed" -ne "0" ] ; then \
>+ echo "Failed # of tests: $$failed" ; \
>+ echo ------------------- ; \
>+ grep '\[ fail \]' ${PWD}/test_*.log | sed 's#.*:##g' ; \
>+ echo =================== ; \
>+ echo ; \
>+ false ; \
>+ fi
>+
>+docker_test_ubuntu: docker_common
>+ # post test stage
>+ docker rmi -f ${DOCKER_IMAGE}_tmp
>
> deps_ubuntu:
>- sudo apt-get update && apt-get install -y -f \
>+ sudo apt-get update \
>+ >/tarantool/apt_update.log 2>&1 \
>+ && echo "APT update PASSED" \
>+ || ( echo "APT update FAILED" ; \
>+ cat /tarantool/apt_update.log ; \
>+ exit 1 )
>+ sudo apt-get install -y -f \
> build-essential cmake coreutils sed \
> libreadline-dev libncurses5-dev libyaml-dev libssl-dev \
> libcurl4-openssl-dev libunwind-dev libicu-dev \
> python python-pip python-setuptools python-dev \
> python-msgpack python-yaml python-argparse python-six python-gevent \
>- lcov ruby
>+ lcov ruby rsync \
>+ >/tarantool/apt_install.log 2>&1 \
>+ && echo "APT install PASSED" \
>+ || ( echo "APT install FAILED" ; \
>+ cat /tarantool/apt_install.log ; \
>+ exit 1 )
>
> test_ubuntu: deps_ubuntu
>- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError ${CMAKE_EXTRA_PARAMS}
>- make -j8
>- cd test && /usr/bin/python test-run.py -j 1
>+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError ${CMAKE_EXTRA_PARAMS} \
>+ >/tarantool/cmake.log 2>&1 \
>+ && echo "CMAKE PASSED" \
>+ || ( echo "CMAKE FAILED" ; \
>+ cat /tarantool/cmake.log ; \
>+ exit 1 )
>+ make -j \
>+ >/tarantool/make.log 2>&1 \
>+ && echo "MAKE PASSED" \
>+ || ( echo "MAKE FAILED" ; \
>+ cat /tarantool/make.log ; \
>+ exit 1 )
>
>+run_test_ubuntu:
>+ file="test_$(subst /,_,${TEST}).log" ; \
>+ sfile="/tarantool_ws/$$file" ; \
>+ cd test && /usr/bin/python test-run.py -j 1 ${TEST} \
>+ >$$sfile 2>&1 \
>+ && ( echo "TEST(${TEST}) PASSED" ; \
>+ grep "Statistics:" -A1000 $$sfile | grep -v Statistics ) \
>+ || ( echo "TEST(${TEST}) FAILED" ; \
>+ cat $$file ; \
>+ cp -f $$sfile /tarantool/. ; \
>+ exit 1 )
>+
> deps_osx:
> brew update
> brew install openssl readline curl icu4c --force
>@@ -66,10 +140,46 @@ test_osx: deps_osx
> deactivate
>
> coverage_ubuntu: deps_ubuntu
>- cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
>- make -j8
>+ cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON \
>+ >/tarantool/cmake.log 2>&1 \
>+ && echo "CMAKE PASSED" \
>+ || ( echo "CMAKE FAILED" ; \
>+ cat /tarantool/cmake.log ; \
>+ exit 1 )
>+ make -j \
>+ >/tarantool/make.log 2>&1 \
>+ && echo "MAKE PASSED" \
>+ || ( echo "MAKE FAILED" ; \
>+ cat /tarantool/make.log ; \
>+ exit 1 )
>+
>+run_coverage_ubuntu:
> # Enable --long tests for coverage
>- cd test && /usr/bin/python test-run.py -j 1 --long
>+ file="test_$(subst /,_,${TEST}).log" ; \
>+ sfile="/tarantool_ws/$$file" ; \
>+ cd test && /usr/bin/python test-run.py -j 1 --long ${TEST} \
>+ >$$file 2>&1 \
>+ && ( rsync -uqr /tarantool_ws/src/ /tarantool/src >/dev/null 2>&1 ; \
>+ echo "TEST(${TEST}) PASSED" ; \
>+ grep "Statistics:" -A1000 $$file | grep -v Statistics ) \
>+ || ( echo "TEST(${TEST}) FAILED" ; \
>+ cat $$file ; \
>+ cp -f $$sfile /tarantool/. ; \
>+ exit 1 )
>+
>+docker_coverage_ubuntu: docker_common
>+ # post test stage
>+ docker run \
>+ --rm=true --tty=true \
>+ --volume "${PWD}:/tarantool" \
>+ --workdir /tarantool \
>+ -e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
>+ -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \
>+ ${DOCKER_IMAGE}_tmp \
>+ /bin/bash -c "make -f .travis.mk analyze_coverage_ubuntu || exit 1"
>+ docker rmi -f ${DOCKER_IMAGE}_tmp
>+
>+analyze_coverage_ubuntu:
> lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
> lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
> --output-file coverage.info
>@@ -79,7 +189,7 @@ coverage_ubuntu: deps_ubuntu
> gem install coveralls-lcov; \
> echo coveralls-lcov --service-name travis-ci --service-job-id $(TRAVIS_JOB_ID) --repo-token [FILTERED] coverage.info; \
> coveralls-lcov --service-name travis-ci --service-job-id $(TRAVIS_JOB_ID) --repo-token $(COVERALLS_TOKEN) coverage.info; \
>- fi;
>+ fi
>
> source:
> git clone https://github.com/packpack/packpack.git packpack
>
>
>
>--
>Alexander Tikhonov
--
Alexander Tikhonov
[-- Attachment #2: Type: text/html, Size: 21222 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-27 5:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-27 5:01 [tarantool-patches] travis-ci: changed the travis build routine to run tests in separate dockers Alexander Tikhonov
2019-02-27 5:03 ` [tarantool-patches] " Alexander Tikhonov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox