[Tarantool-patches] [PATCH v5 0/2] add Catalina OSX 10.15 to gitlab-ci

[Tarantool-patches] [PATCH v5 0/2] add Catalina OSX 10.15 to gitlab-ci

[Alexander V. Tikhonov]

gitlab-ci: add Catalina OSX 10.15

Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,
due to decided to have only 2 last major releases, for now it is
10.14 and 10.15 OSX versions. Also changed the commit job for branches
from 10.14 to 10.15 OSX version.

Also added homebrew installation routine as it was suggested in its
instructions. Added installation of the cmake and tool. Added upgrade
of the OSX packages to avoid of fails on already existed packages,
but of the previous versions. Added reinstallation of the python2
with force option to be able to install it to /usr/local/ path to
make pip install there too.

Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina
v4:https://lists.tarantool.org/pipermail/tarantool-patches/2020-January/013728.html
v3:https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/013133.html
v2:https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/013094.html
v1:https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/012951.html

Changes v5:
- added the path setup with /etc/profile
Changes v4:
- removed unneeded code
Changes v3:
- divided commit into 2 separate commits
Changes v2:
- added comments, made corrections

Alexander V. Tikhonov (2):
  build: tune OSX environment
  gitlab-ci: add Catalina OSX 10.15

 .gitlab-ci.yml | 11 ++++++-----
 .travis.mk     | 30 +++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 14 deletions(-)

-- 
2.17.1

[Tarantool-patches] [PATCH v5 1/2] build: tune OSX environment

[Alexander V. Tikhonov]

Added homebrew installation routine as it was suggested in its
instructions. Added installation of the cmake tool. Added upgrade
of the OSX packages to avoid of fails on already existed packages
with the previous versions.

Added reinstallation of the python2 with force option to be able
to install it to /usr/local/ path to make pip install there too.
---
 .travis.mk | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 42969ff56..60bbf3c1b 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -127,16 +127,27 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps
 # OSX #
 #######
 
+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python2
+
 deps_osx:
-	brew update
-	brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force
-	python2 -V || brew install python2 --force
-	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py >get-pip.py
-	python get-pip.py --user
-	pip install --user --force-reinstall -r test-run/requirements.txt
+	# install brew using command from Homebrew repository instructions:
+	#   https://github.com/Homebrew/install
+	# NOTE: 'echo' command below is required since brew installation
+	# script obliges the one to enter a newline for confirming the
+	# installation via Ruby script.
+	brew update || echo | /usr/bin/ruby -e \
+		"$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+	# try to install the packages either upgrade it to avoid of fails
+	# if the package already exists with the previous version
+	brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS} 
+	curl --silent --show-error --retry 5 \
+		https://bootstrap.pypa.io/get-pip.py >get-pip.py
+	python get-pip.py
+	pip install --force-reinstall -r test-run/requirements.txt
 
 build_osx:
-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
+	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \
 	make -j
 
 test_osx_no_deps: build_osx
@@ -153,8 +164,9 @@ test_osx_no_deps: build_osx
 		ulimit -n ${MAX_FILES} || : ; \
 		ulimit -n ; \
 		cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \
-			app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \
-			replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/
+			app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ \
+			long_run-py/ luajit-tap/ replication-py/ small/ sql/ \
+			sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/
 
 test_osx: deps_osx test_osx_no_deps
 
-- 
2.17.1

Re: [Tarantool-patches] [PATCH v5 1/2] build: tune OSX environment

[Oleg Piskunov]

[-- Attachment #1: Type: text/plain, Size: 2906 bytes --]

LGTM


>Среда, 22 января 2020, 10:28 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:
>
>Added homebrew installation routine as it was suggested in its
>instructions. Added installation of the cmake tool. Added upgrade
>of the OSX packages to avoid of fails on already existed packages
>with the previous versions.
>
>Added reinstallation of the python2 with force option to be able
>to install it to /usr/local/ path to make pip install there too.
>---
> .travis.mk | 30 +++++++++++++++++++++---------
> 1 file changed, 21 insertions(+), 9 deletions(-)
>
>diff --git a/.travis.mk b/.travis.mk
>index 42969ff56..60bbf3c1b 100644
>--- a/.travis.mk
>+++ b/.travis.mk
>@@ -127,16 +127,27 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps
> # OSX #
> #######
> 
>+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python2
>+
> deps_osx:
>-	brew update
>-	brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force
>-	python2 -V || brew install python2 --force
>-	curl --silent --show-error --retry 5  https://bootstrap.pypa.io/get-pip.py >get-pip.py
>-	python get-pip.py --user
>-	pip install --user --force-reinstall -r test-run/requirements.txt
>+	# install brew using command from Homebrew repository instructions:
>+	#  https://github.com/Homebrew/install
>+	# NOTE: 'echo' command below is required since brew installation
>+	# script obliges the one to enter a newline for confirming the
>+	# installation via Ruby script.
>+	brew update || echo | /usr/bin/ruby -e \
>+		"$$(curl -fsSL  https://raw.githubusercontent.com/Homebrew/install/master/install )"
>+	# try to install the packages either upgrade it to avoid of fails
>+	# if the package already exists with the previous version
>+	brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS} 
>+	curl --silent --show-error --retry 5 \
>+		 https://bootstrap.pypa.io/get-pip.py >get-pip.py
>+	python get-pip.py
>+	pip install --force-reinstall -r test-run/requirements.txt
> 
> build_osx:
>-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
>+	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
>+		-DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \
> 	make -j
> 
> test_osx_no_deps: build_osx
>@@ -153,8 +164,9 @@ test_osx_no_deps: build_osx
> 		ulimit -n ${MAX_FILES} || : ; \
> 		ulimit -n ; \
> 		cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \
>-			app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \
>-			replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/
>+			app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ \
>+			long_run-py/ luajit-tap/ replication-py/ small/ sql/ \
>+			sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/
> 
> test_osx: deps_osx test_osx_no_deps
> 
>-- 
>2.17.1
>


-- 
Oleg Piskunov

[-- Attachment #2: Type: text/html, Size: 3859 bytes --]

[Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15

[Alexander V. Tikhonov]

Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,
due to decided to have only 2 last major releases, for now it is
10.14 and 10.15 OSX versions. Also changed the commit job for branches
from 10.14 to 10.15 OSX version.
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af5a3c8a..7beb8ec08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,19 +90,20 @@ release_asan_clang8:
   script:
     - ${GITLAB_MAKE} test_asan_debian_no_deps
 
-osx_13_release:
-  <<: *release_only_definition
+osx_15_release:
   <<: *vbox_definition
   tags:
-    - vms_osx_13
+    - vms_osx_15
   variables:
-    VMS_NAME: 'osx_13'
+    EXTRA_ENV: '. /etc/profile ;'
+    VMS_NAME: 'osx_15'
     VMS_USER: 'tarantool'
-    VMS_PORT: '2212'
+    VMS_PORT: '2242'
   script:
     - ${GITLAB_MAKE} vms_test_osx
 
 osx_14_release:
+  <<: *release_only_definition
   <<: *vbox_definition
   tags:
     - vms_osx_14
-- 
2.17.1

Re: [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15

[Oleg Piskunov]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

LGTM


>Среда, 22 января 2020, 10:28 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:
>
>Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,
>due to decided to have only 2 last major releases, for now it is
>10.14 and 10.15 OSX versions. Also changed the commit job for branches
>from 10.14 to 10.15 OSX version.
>---
> .gitlab-ci.yml | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 3af5a3c8a..7beb8ec08 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -90,19 +90,20 @@ release_asan_clang8:
>   script:
>     - ${GITLAB_MAKE} test_asan_debian_no_deps
> 
>-osx_13_release:
>-  <<: *release_only_definition
>+osx_15_release:
>   <<: *vbox_definition
>   tags:
>-    - vms_osx_13
>+    - vms_osx_15
>   variables:
>-    VMS_NAME: 'osx_13'
>+    EXTRA_ENV: '. /etc/profile ;'
>+    VMS_NAME: 'osx_15'
>     VMS_USER: 'tarantool'
>-    VMS_PORT: '2212'
>+    VMS_PORT: '2242'
>   script:
>     - ${GITLAB_MAKE} vms_test_osx
> 
> osx_14_release:
>+  <<: *release_only_definition
>   <<: *vbox_definition
>   tags:
>     - vms_osx_14
>-- 
>2.17.1
>


-- 
Oleg Piskunov

[-- Attachment #2: Type: text/html, Size: 1933 bytes --]