<HTML><BODY><div>Alexander, below my comments:<br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Четверг, 27 февраля 2020, 13:30 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15827994140048604290_BODY">Added mac mini hosts into testing and set to it all<br>OSX 10.14 test jobs with new osx_14 gitlab-runner tag.<br>Also made additional setup:<br> - added PATHs to python2 and pip<br> - set 'var' directory for test-run tool to the shorter<br> path name to avoid of issues with long names.<br>---<br><br>Github: <a href="https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci" target="_blank">https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci</a><br><br> .gitlab-ci.yml | 20 ++++++++------------<br> .gitlab.mk | 2 +-<br> .travis.mk | 45 ++++++++++++++++++++++++++++++++-------------<br> 3 files changed, 41 insertions(+), 26 deletions(-)<br><br>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>index 5177a9903..7414dd578 100644<br>--- a/.gitlab-ci.yml<br>+++ b/.gitlab-ci.yml<br>@@ -152,28 +152,24 @@ osx_13_release:<br> - ${GITLAB_MAKE} vms_test_osx<br> <br> osx_14_release:<br>- <<: *vbox_definition<br>+ <<: *docker_test_definition<br> tags:<br>- - vms_osx_14<br>+ - osx_14<br> variables:<br>- VMS_NAME: 'osx_14'<br>- VMS_USER: 'tarantool'<br>- VMS_PORT: '2222'<br>+ PYTHON2: "python"</div></div></div></div></blockquote></div><div>Please add comment with explanation about bypassing situation with python2 EOL.</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div> script:<br>- - ${GITLAB_MAKE} vms_test_osx<br>+ - ${GITLAB_MAKE} test_osx<br> <br> osx_14_release_lto:<br> <<: *release_only_definition<br>- <<: *vbox_definition<br>+ <<: *docker_test_definition<br> tags:<br>- - vms_osx_14<br>+ - osx_14<br> variables:<br> EXTRA_ENV: "export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;"<br>- VMS_NAME: 'osx_14'<br>- VMS_USER: 'tarantool'<br>- VMS_PORT: '2222'<br>+ PYTHON2: "python"<br> script:<br>- - ${GITLAB_MAKE} vms_test_osx<br>+ - ${GITLAB_MAKE} test_osx<br> <br> freebsd_12_release:<br> <<: *vbox_definition<br>diff --git a/.gitlab.mk b/.gitlab.mk<br>index b39c5c651..d804d3cf6 100644<br>--- a/.gitlab.mk<br>+++ b/.gitlab.mk<br>@@ -14,7 +14,7 @@ git_submodule_update:<br> git submodule update --recursive --init<br> <br> # Pass *_no_deps goals to .travis.mk.<br>-test_%_no_deps: git_submodule_update<br>+test_%: git_submodule_update<br> ${TRAVIS_MAKE} $@<br> <br> # #######################################################<br>diff --git a/.travis.mk b/.travis.mk<br>index 42969ff56..90ad0b412 100644<br>--- a/.travis.mk<br>+++ b/.travis.mk<br>@@ -5,6 +5,7 @@<br> DOCKER_IMAGE?=packpack/packpack:debian-stretch<br> TEST_RUN_EXTRA_PARAMS?=<br> MAX_FILES?=65534<br>+MAX_PROC?=4096</div></div></div></div></blockquote></div><div>Please use 2500 instead 4096. This is hard coded in OSX kernel to 2500.</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div> <br> all: package<br> <br>@@ -127,16 +128,28 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps<br> # OSX #<br> #######<br> <br>+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake ${PYTHON2}<br>+<br> deps_osx:<br>- brew update<br>- brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force<br>- python2 -V || brew install python2 --force<br>- curl --silent --show-error --retry 5 <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py<br>- python get-pip.py --user<br>- pip install --user --force-reinstall -r test-run/requirements.txt<br>+ # install brew using command from Homebrew repository instructions:<br>+ # <a href="https://github.com/Homebrew/install" target="_blank">https://github.com/Homebrew/install</a><br>+ # NOTE: 'echo' command below is required since brew installation<br>+ # script obliges the one to enter a newline for confirming the<br>+ # installation via Ruby script.<br>+ brew update || echo | /usr/bin/ruby -e \<br>+ "$(curl -fsSL <a href="https://raw.githubusercontent.com/Homebrew/install/master/install" target="_blank">https://raw.githubusercontent.com/Homebrew/install/master/install</a>)"<br>+ # try to install the packages either upgrade it to avoid of fails<br>+ # if the package already exists with the previous version<br>+ brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}<br>+ curl --silent --show-error --retry 5 \<br>+ <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py</div></div></div></div></blockquote></div><div>Please do not use strings refactoring</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div>+ python get-pip.py<br>+ export PATH=/Users/${USER}/Library/Python/2.7/bin:${PATH} ; \<br>+ pip install --force-reinstall -r test-run/requirements.txt<br> <br> build_osx:<br>- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}<br>+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \<br>+ -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}</div></div></div></div></blockquote></div><div>Please do not use strings refactoring</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div> make -j<br> <br> test_osx_no_deps: build_osx<br>@@ -148,13 +161,19 @@ test_osx_no_deps: build_osx<br> # call as tests runs call.<br> # Tests: Temporary excluded replication/ suite with some tests<br> # from other suites by issues #4357 and #4370<br>- echo tarantool | sudo -S launchctl limit maxfiles ${MAX_FILES} || : ; \<br>+ sudo -S launchctl limit maxfiles ${MAX_FILES} || : ; \<br> launchctl limit maxfiles || : ; \<br>- ulimit -n ${MAX_FILES} || : ; \<br>- ulimit -n ; \<br>- cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \<br>- app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \<br>- replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/<br>+ ulimit -n ${MAX_FILES} || : ulimit -n ; \</div></div></div></div></blockquote></div><div>Please do not use strings refactoring</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div>+ sudo -S launchctl limit maxproc ${MAX_PROC} || : ; \<br>+ launchctl limit maxproc || : ; \<br>+ ulimit -u ${MAX_PROC} || : ulimit -u ; \</div></div></div></div></blockquote></div><div>Please use the same format as above (one comand per line)</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div>+ export PATH=/System/Library/Frameworks/Python.framework/Versions/2.7/bin:${PATH} ; \<br>+ rm -rf /tmp/tnt ; \<br>+ cd test && ./test-run.py --vardir /tmp/tnt \<br>+ --force $(TEST_RUN_EXTRA_PARAMS) \</div></div></div></div></blockquote></div><div>Please join two lines above</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div>+ app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ \<br>+ long_run-py/ luajit-tap/ replication-py/ small/ sql/ \<br>+ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/</div></div></div></div></blockquote></div><div>Please do not use strings refactoring</div><div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div><div class="js-helper js-readmsg-msg"><div><div> <br> test_osx: deps_osx test_osx_no_deps<br> <br>--<br>2.17.1<br> </div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Oleg Piskunov</div></div></div><div> </div></div></BODY></HTML>