[Tarantool-patches] [PATCH v2 5/5] gitlab-ci: add out-of-source build
Alexander V. Tikhonov
avtikhon at tarantool.org
Wed Oct 14 11:39:28 MSK 2020
Implemented out-of-source build at cmake files. Added out of source
build make targets and added test job to gitlab-ci.
Closes #4874
---
Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4874-out-of-source-build-full-ci
Issue: https://github.com/tarantool/tarantool/issues/4874
V2: removed changes not for gitlab-ci.
.gitlab-ci.yml | 7 +++++++
.travis.mk | 26 +++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d40dc74e3..d5dc52f82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,6 +174,13 @@ luacheck:
# Tests
+out_of_source:
+ stage: test
+ tags:
+ - deploy_test
+ script:
+ - ${GITLAB_MAKE} test_oos_build
+
release:
<<: *docker_test_definition
script:
diff --git a/.travis.mk b/.travis.mk
index d797472e2..5730e1097 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -7,7 +7,9 @@ DOCKER_IMAGE_TARANTOOL="registry.gitlab.com/tarantool/tarantool/testing/debian-s
TEST_RUN_EXTRA_PARAMS?=
MAX_FILES?=65534
MAX_PROC?=2500
-OOS_SRC_PATH="/source"
+OOS_SRC_PATH?="/source"
+OOS_BUILD_PATH?="/rw_bins"
+OOS_BUILD_RULE?=test_oos_no_deps
BIN_DIR=/usr/local/bin
OSX_VARDIR?=/tmp/tnt
@@ -207,6 +209,28 @@ test_debian_install_luacheck:
test_debian_luacheck: test_debian_install_luacheck configure_debian
make luacheck
+# Out-Of-Source build
+
+build_oos:
+ mkdir ${OOS_BUILD_PATH} 2>/dev/null || : ; \
+ cd ${OOS_BUILD_PATH} && \
+ cmake ${OOS_SRC_PATH} ${CMAKE_EXTRA_PARAMS} && \
+ make -j
+
+test_oos_no_deps: build_oos
+ cd ${OOS_BUILD_PATH}/test && \
+ ${OOS_SRC_PATH}/test/test-run.py \
+ --builddir ${OOS_BUILD_PATH} \
+ --vardir ${OOS_BUILD_PATH}/test/var --force
+
+test_oos: deps_debian test_oos_no_deps
+
+test_oos_build:
+ docker run --network=host -w ${OOS_SRC_PATH} \
+ --mount type=bind,source="${PWD}",target=${OOS_SRC_PATH},readonly,bind-propagation=rslave \
+ -i ${DOCKER_IMAGE_TARANTOOL} \
+ make -f .travis.mk ${OOS_BUILD_RULE}
+
#######
# OSX #
#######
--
2.25.1
More information about the Tarantool-patches
mailing list