<HTML><BODY>Oleg, thanks for your review, I've made the changes and commented the review.<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Пятница, 28 февраля 2020, 22:23 +03:00 от Oleg Piskunov <o.piskunov@tarantool.org>:<br><br><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15829178231262008757_BODY"><div class="class_1583430501"><div><div>Sasha,</div><div>I guess it doesn’t work correctly around python and pip installation.</div><div>Here is your latest log from the gitlab-ci run (<a rel="noopener noreferrer" href="https://gitlab.com/tarantool/tarantool/-/jobs/452400831" target="_blank">https://gitlab.com/tarantool/tarantool/-/jobs/452400831</a>):</div><div><div style="-webkit-text-stroke-width:0px;background-color:#111111;box-sizing:border-box;color:#ffffff;font-family:Menlo,'DejaVu Sans Mono','Liberation Mono',Consolas,'Ubuntu Mono','Courier New','andale mono','lucida console',monospace;font-size:13px;font-style:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-weight:400;letter-spacing:normal;min-height:1.25rem;orphans:2;padding:1px 8px 1px 55px;text-align:left;text-decoration-color:initial;text-decoration-style:initial;text-indent:0px;text-transform:none;white-space:normal;widows:2;word-spacing:0px" class="js-line_mailru_css_attribute_postfix log-line_mailru_css_attribute_postfix"><span style="box-sizing: border-box;white-space: pre-wrap;" class="ws-pre-wrap_mailru_css_attribute_postfix">brew install --force openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python || brew upgrade openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python</span></div><div style="-webkit-text-stroke-width:0px;background-color:#111111;box-sizing:border-box;color:#ffffff;font-family:Menlo,'DejaVu Sans Mono','Liberation Mono',Consolas,'Ubuntu Mono','Courier New','andale mono','lucida console',monospace;font-size:13px;font-style:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-weight:400;letter-spacing:normal;min-height:1.25rem;orphans:2;padding:1px 8px 1px 55px;text-align:left;text-decoration-color:initial;text-decoration-style:initial;text-indent:0px;text-transform:none;white-space:normal;widows:2;word-spacing:0px" class="js-line_mailru_css_attribute_postfix log-line_mailru_css_attribute_postfix">...</div><div style="-webkit-text-stroke-width:0px;background-color:#111111;box-sizing:border-box;color:#ffffff;font-family:Menlo,'DejaVu Sans Mono','Liberation Mono',Consolas,'Ubuntu Mono','Courier New','andale mono','lucida console',monospace;font-size:13px;font-style:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-weight:400;letter-spacing:normal;min-height:1.25rem;orphans:2;padding:1px 8px 1px 55px;text-align:left;text-decoration-color:initial;text-decoration-style:initial;text-indent:0px;text-transform:none;white-space:normal;widows:2;word-spacing:0px" class="js-line_mailru_css_attribute_postfix log-line_mailru_css_attribute_postfix"><span style="box-sizing: border-box;white-space: pre-wrap;" class="ws-pre-wrap_mailru_css_attribute_postfix">Warning: python 3.7.6_1 is already installed and up-to-date</span></div><div style="-webkit-text-stroke-width:0px;background-color:#111111;box-sizing:border-box;color:#ffffff;font-family:Menlo,'DejaVu Sans Mono','Liberation Mono',Consolas,'Ubuntu Mono','Courier New','andale mono','lucida console',monospace;font-size:13px;font-style:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-weight:400;letter-spacing:normal;min-height:1.25rem;orphans:2;padding:1px 8px 1px 55px;text-align:left;text-decoration-color:initial;text-decoration-style:initial;text-indent:0px;text-transform:none;white-space:normal;widows:2;word-spacing:0px" class="js-line_mailru_css_attribute_postfix log-line_mailru_css_attribute_postfix"><span style="box-sizing: border-box;white-space: pre-wrap;" class="ws-pre-wrap_mailru_css_attribute_postfix">To reinstall 3.7.6_1, run `brew reinstall python`</span></div></div></div><div>As you can see brew install updating python3 instead of python2.7</div><div>The reason that it still working correctly is that python2.7 preinstalled before into different path which you are using.</div><div>Need to investigate and fix.</div></div></div></div></div></div></blockquote>Found that python 2 was removed just a few days ago at all from the brew formulas. To make<br>it workable found the solution to use the latest Python 2 commit.<br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15829178231262008757_BODY"><div class="class_1583430501"><div><div class="mail-quote-collapse"><blockquote style="border-left:1px solid #0857A6;margin:10px;padding:0 0 0 10px;">Четверг, 27 февраля 2020, 16:23 +03:00 от Alexander V. Tikhonov <<a href="mailto:avtikhon@tarantool.org">avtikhon@tarantool.org</a>>:<div id=""><div class="js-helper_mailru_css_attribute_postfix js-readmsg-msg_mailru_css_attribute_postfix"><div><div id="style_15828098080298114111_BODY_mailru_css_attribute_postfix">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 rel="noopener noreferrer" 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 | 32 +++++++++++++++++++++++++-------<br> 3 files changed, 34 insertions(+), 20 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"<br> 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..9db49a6b7 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?=2500<br><br> all: package<br><br>@@ -127,13 +128,24 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps<br> # OSX #<br> #######<br><br>+# Python2 is EOF and we need to be sure that it is in use instead of Python3<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>+ # install brew using command from Homebrew repository instructions:<br>+ # <a rel="noopener noreferrer" 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 rel="noopener noreferrer" 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 <a rel="noopener noreferrer" 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>+ 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>@@ -148,11 +160,17 @@ 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>+ sudo -S launchctl limit maxproc ${MAX_PROC} || : ; \<br>+ launchctl limit maxproc || : ; \<br>+ ulimit -u ${MAX_PROC} || : ; \<br>+ ulimit -u ; \<br>+ 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 --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><br>--<br>2.17.1<br></div></div></div></div></blockquote></div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Oleg Piskunov</div></div></div></div></div></div></div></div></div></blockquote>
<br>
<br>-- <br>Alexander Tikhonov<br></BODY></HTML>