Switched OSX 10.14 test jobs to MAC mini hosts.
Renamed Gitlab make rule target 'test_%_no_deps' to 'test_%', which is
used to pass all appropriate target calls to Travis make rule target.
---
Github:
https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci .gitlab-ci.yml | 19 ++++++-------------
.gitlab.mk | 2 +-
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5177a9903..47e4af5a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,28 +152,21 @@ osx_13_release:
- ${GITLAB_MAKE} vms_test_osx
osx_14_release:
- <<: *vbox_definition
+ <<: *docker_test_definition
tags:
- - vms_osx_14
- variables:
- VMS_NAME: 'osx_14'
- VMS_USER: 'tarantool'
- VMS_PORT: '2222'
+ - osx_14
script:
- - ${GITLAB_MAKE} vms_test_osx
+ - ${GITLAB_MAKE} test_osx
osx_14_release_lto:
<<: *release_only_definition
- <<: *vbox_definition
+ <<: *docker_test_definition
tags:
- - vms_osx_14
+ - osx_14
variables:
EXTRA_ENV: "export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;"
- VMS_NAME: 'osx_14'
- VMS_USER: 'tarantool'
- VMS_PORT: '2222'
script:
- - ${GITLAB_MAKE} vms_test_osx
+ - ${GITLAB_MAKE} test_osx
freebsd_12_release:
<<: *vbox_definition
diff --git a/.gitlab.mk b/.gitlab.mk
index b39c5c651..d804d3cf6 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -14,7 +14,7 @@ git_submodule_update:
git submodule update --recursive --init
# Pass *_no_deps goals to .travis.mk.
-test_%_no_deps: git_submodule_update
+test_%: git_submodule_update
${TRAVIS_MAKE} $@
# #######################################################
--
2.17.1