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

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

[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 added homebrew installation routine as it was suggested in its
instructions. Added path in environment to reach the pip binary that
was additionally installed based on python2 version in addition to
pip3 which is the default in Catalina OSX 10.15. 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.

Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina
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 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 |  8 ++++----
 .travis.mk     | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 9 deletions(-)

-- 
2.17.1

[Tarantool-patches] [PATCH v3 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.
---
 .travis.mk | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 42969ff56..35d9a4f7e 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -127,17 +127,31 @@ 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
+
 deps_osx:
-	brew update
-	brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force
+	# 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.
+	export PATH=${PATH}:/usr/local/bin ; \
+		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
+	export PATH=${PATH}:/usr/local/bin ; \
+		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
 	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
 
 build_osx:
-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
-	make -j
+	export PATH=${PATH}:/usr/local/bin ; \
+		cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+			-DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \
+		make -j
 
 test_osx_no_deps: build_osx
 	# Limits: Increase the maximum number of open file descriptors on macOS:
-- 
2.17.1

[Tarantool-patches] [PATCH v3 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.

Added path in environment to reach the pip binary that was additionally
installed based on python2 version in addition to pip3 which is the
default in Catalina OSX 10.15.
---
 .gitlab-ci.yml |  8 ++++----
 .travis.mk     | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af5a3c8a..d3cb959d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,15 +90,15 @@ release_asan_clang8:
   script:
     - ${GITLAB_MAKE} test_asan_debian_no_deps
 
-osx_13_release:
+osx_15_release:
   <<: *release_only_definition
   <<: *vbox_definition
   tags:
-    - vms_osx_13
+    - vms_test
   variables:
-    VMS_NAME: 'osx_13'
+    VMS_NAME: 'osx_15'
     VMS_USER: 'tarantool'
-    VMS_PORT: '2212'
+    VMS_PORT: '2242'
   script:
     - ${GITLAB_MAKE} vms_test_osx
 
diff --git a/.travis.mk b/.travis.mk
index 35d9a4f7e..b2ecdd87d 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -142,10 +142,19 @@ deps_osx:
 	# if the package already exists with the previous version
 	export PATH=${PATH}:/usr/local/bin ; \
 		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
+	# OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'
+	# part in Release Notes:
+	#   Use of Python 2.7 isn’t recommended. This version is included in
+	#   macOS for compatibility with legacy software. Future versions of
+	#   macOS won’t include Python 2.7. Instead, it’s recommended that
+	#   you run python3 in Terminal. (51097165)
 	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
+	# To make pip tools available, the PATH environment must include the
+	# path to its binaries
+	export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \
+		pip install --user --force-reinstall -r test-run/requirements.txt
 
 build_osx:
 	export PATH=${PATH}:/usr/local/bin ; \
-- 
2.17.1

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

[Alexander Tikhonov]

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



Oleg,
Please review the patch.

>Среда, 18 декабря 2019, 9:11 +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.
>
>Added path in environment to reach the pip binary that was additionally
>installed based on python2 version in addition to pip3 which is the
>default in Catalina OSX 10.15.
>---
> .gitlab-ci.yml |  8 ++++----
> .travis.mk     | 11 ++++++++++-
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 3af5a3c8a..d3cb959d0 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -90,15 +90,15 @@ release_asan_clang8:
>   script:
>     - ${GITLAB_MAKE} test_asan_debian_no_deps
> 
>-osx_13_release:
>+osx_15_release:
>   <<: *release_only_definition
>   <<: *vbox_definition
>   tags:
>-    - vms_osx_13
>+    - vms_test
>   variables:
>-    VMS_NAME: 'osx_13'
>+    VMS_NAME: 'osx_15'
>     VMS_USER: 'tarantool'
>-    VMS_PORT: '2212'
>+    VMS_PORT: '2242'
>   script:
>     - ${GITLAB_MAKE} vms_test_osx
> 
>diff --git a/.travis.mk b/.travis.mk
>index 35d9a4f7e..b2ecdd87d 100644
>--- a/.travis.mk
>+++ b/.travis.mk
>@@ -142,10 +142,19 @@ deps_osx:
> 	# if the package already exists with the previous version
> 	export PATH=${PATH}:/usr/local/bin ; \
> 		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
>+	# OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'
>+	# part in Release Notes:
>+	#   Use of Python 2.7 isn’t recommended. This version is included in
>+	#   macOS for compatibility with legacy software. Future versions of
>+	#   macOS won’t include Python 2.7. Instead, it’s recommended that
>+	#   you run python3 in Terminal. (51097165)
> 	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
>+	# To make pip tools available, the PATH environment must include the
>+	# path to its binaries
>+	export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \
>+		pip install --user --force-reinstall -r test-run/requirements.txt
> 
> build_osx:
> 	export PATH=${PATH}:/usr/local/bin ; \
>-- 
>2.17.1
>


-- 
Alexander Tikhonov

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

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

[Oleg Piskunov]

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

Sasha,

Need to fix python2 and pip installation procedure.
ATM VMS image consist python2.7 installed into system (/usr/bin) resulting "incorect"
python2 and pip installation. 
Need to add python2 into brew installation with (--force) and continue to use python2
installed into /usr/local/bin.

Regards,
Oleg


>Понедельник, 20 января 2020, 15:26 +03:00 от Alexander Tikhonov <avtikhon@tarantool.org>:
>
>
>Oleg,
>Please review the patch.
>
>>Среда, 18 декабря 2019, 9:11 +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.
>>
>>Added path in environment to reach the pip binary that was additionally
>>installed based on python2 version in addition to pip3 which is the
>>default in Catalina OSX 10.15.
>>---
>> .gitlab-ci.yml |  8 ++++----
>> .travis.mk     | 11 ++++++++++-
>> 2 files changed, 14 insertions(+), 5 deletions(-)
>>
>>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>index 3af5a3c8a..d3cb959d0 100644
>>--- a/.gitlab-ci.yml
>>+++ b/.gitlab-ci.yml
>>@@ -90,15 +90,15 @@ release_asan_clang8:
>>   script:
>>     - ${GITLAB_MAKE} test_asan_debian_no_deps
>> 
>>-osx_13_release:
>>+osx_15_release:
>>   <<: *release_only_definition
>>   <<: *vbox_definition
>>   tags:
>>-    - vms_osx_13
>>+    - vms_test
>>   variables:
>>-    VMS_NAME: 'osx_13'
>>+    VMS_NAME: 'osx_15'
>>     VMS_USER: 'tarantool'
>>-    VMS_PORT: '2212'
>>+    VMS_PORT: '2242'
>>   script:
>>     - ${GITLAB_MAKE} vms_test_osx
>> 
>>diff --git a/.travis.mk b/.travis.mk
>>index 35d9a4f7e..b2ecdd87d 100644
>>--- a/.travis.mk
>>+++ b/.travis.mk
>>@@ -142,10 +142,19 @@ deps_osx:
>> 	# if the package already exists with the previous version
>> 	export PATH=${PATH}:/usr/local/bin ; \
>> 		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
>>+	# OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'
>>+	# part in Release Notes:
>>+	#   Use of Python 2.7 isn’t recommended. This version is included in
>>+	#   macOS for compatibility with legacy software. Future versions of
>>+	#   macOS won’t include Python 2.7. Instead, it’s recommended that
>>+	#   you run python3 in Terminal. (51097165)
>> 	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
>>+	# To make pip tools available, the PATH environment must include the
>>+	# path to its binaries
>>+	export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \
>>+		pip install --user --force-reinstall -r test-run/requirements.txt
>> 
>> build_osx:
>> 	export PATH=${PATH}:/usr/local/bin ; \
>>-- 
>>2.17.1
>>
>
>
>-- 
>Alexander Tikhonov


-- 
Oleg Piskunov

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