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

[Tarantool-patches] [PATCH v1 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 changed the commit job for branches
from 10.14 to 10.15 OSX version.
    
Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
otherwise it doesn't have the path to brew installed packages.

Formula tntpython2.rb consist of the packages which download target host
does not have valid SSL certificate, disabled curl SSL check for it,
also the same issue resolved for pip packages.

Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina-full-ci

Alexander V. Tikhonov (2):
  build: disable at OSX curl SSL
  gitlab-ci: add Catalina OSX 10.15

 .gitlab-ci.yml | 11 ++++++-----
 .travis.mk     | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

-- 
2.17.1

[Tarantool-patches] [PATCH v1 1/2] build: disable at OSX curl SSL

[Alexander V. Tikhonov]

Formula tntpython2.rb consist of the packages which download target host
does not have valid SSL certificate, disabled curl SSL check for it.
---
 .travis.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index f709a18b6..e79d50b19 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -151,7 +151,7 @@ test_static_docker_build:
 
 # since Python 2 is EOL it's latest commit from tapped local formula is used
 OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
-	cmake file://$${PWD}/tools/brew_taps/tntpython2.rb
+	cmake
 
 deps_osx:
 	# install brew using command from Homebrew repository instructions:
@@ -164,7 +164,18 @@ deps_osx:
 	# 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}
-	pip install --force-reinstall -r test-run/requirements.txt
+	# Formula tntpython2.rb consist of the packages which download target
+	# host does not have valid SSL certificate, disabled curl SSL
+	# check for it.
+	echo insecure >>$${HOME}/.curlrc
+	brew install --force file://$${PWD}/tools/brew_taps/tntpython2.rb || true
+	sed '$$d' $${HOME}/.curlrc >$${HOME}/.curlrc.new && \
+		mv $${HOME}/.curlrc.new $${HOME}/.curlrc
+	python2 -V
+	pip install --trusted-host files.pythonhosted.org \
+		--upgrade pip setuptools
+	pip install --trusted-host files.pythonhosted.org \
+		--force-reinstall -r test-run/requirements.txt
 
 build_osx:
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
-- 
2.17.1

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

Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
otherwise it doesn't have the path to brew installed packages.
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd710027f..5c9f353a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,19 +139,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
   <<: *docker_test_definition
   tags:
     - osx_14
-- 
2.17.1

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

[Sergey Bronnikov]

Hi,

Sasha, thanks for the patch. See my comment below.

On 11:40 Thu 09 Apr , Alexander V. Tikhonov wrote:
> 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.
>     
> Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
> otherwise it doesn't have the path to brew installed packages.

PATH can be adjusted in runtime with 'export' call and by using
user-specific $HOME/.profile and reloading it to current environemnt.
What are the reasons to touch system-wide file?

> Formula tntpython2.rb consist of the packages which download target host
> does not have valid SSL certificate, disabled curl SSL check for it,
> also the same issue resolved for pip packages.
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina-full-ci
> 
> Alexander V. Tikhonov (2):
>   build: disable at OSX curl SSL
>   gitlab-ci: add Catalina OSX 10.15
> 
>  .gitlab-ci.yml | 11 ++++++-----
>  .travis.mk     | 15 +++++++++++++--
>  2 files changed, 19 insertions(+), 7 deletions(-)
> 
> -- 
> 2.17.1
> 

-- 
sergeyb@

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

[Oleg Piskunov]

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


Hi,
 
Sasha, thanks for the patch. See my comment below.
  
>Четверг, 9 апреля 2020, 11:41 +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.
As far as I remember we agreed to use new HW mac mini for testing 10.15 OSX version.
I don’t understand why you trying to use VMS for it.
>
>Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
>otherwise it doesn't have the path to brew installed packages.
>---
> .gitlab-ci.yml | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index cd710027f..5c9f353a7 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -139,19 +139,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
>   <<: *docker_test_definition
>   tags:
>     - osx_14
>--
>2.17.1
>  
 
 
--
Oleg Piskunov
 

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

Re: [Tarantool-patches] [PATCH v1 1/2] build: disable at OSX curl SSL

[Oleg Piskunov]

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


Hi,
 
Sasha, thanks for the patch. See my comment below.
  
>Четверг, 9 апреля 2020, 11:41 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:
> 
>Formula tntpython2.rb consist of the packages which download target host
>does not have valid SSL certificate, disabled curl SSL check for it.
>---
> .travis.mk | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/.travis.mk b/.travis.mk
>index f709a18b6..e79d50b19 100644
>--- a/.travis.mk
>+++ b/.travis.mk
>@@ -151,7 +151,7 @@ test_static_docker_build:
> 
> # since Python 2 is EOL it's latest commit from tapped local formula is used
> OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
>- cmake file://${PWD}/tools/brew_taps/tntpython2.rb
>+ cmake
*  
As you move formula from this place, please move above comment as well.
*  Would be good to have one line in this place:
OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake
> 
> deps_osx:
>  # install brew using command from Homebrew repository instructions:
>@@ -164,7 +164,18 @@ deps_osx:
>  # 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}
>- pip install --force-reinstall -r test-run/requirements.txt
>+ # Formula tntpython2.rb consist of the packages which download target
>+ # host does not have valid SSL certificate, disabled curl SSL
>+ # check for it.
Above comment really ugly. Please rewrite it more clearly.
>+ echo insecure >>${HOME}/.curlrc
>+ brew install --force file://${PWD}/tools/brew_taps/tntpython2.rb || true
>+ sed '$d' ${HOME}/.curlrc >${HOME}/.curlrc.new && \
>+ mv ${HOME}/.curlrc.new ${HOME}/.curlrc
>+ python2 -V
>+ pip install --trusted-host files.pythonhosted.org \
>+ --upgrade pip setuptools
>+ pip install --trusted-host files.pythonhosted.org \
>+ --force-reinstall -r test-run/requirements.txt
> 
> build_osx:
>  cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
>--
>2.17.1
>  
 
 
--
Oleg Piskunov
 

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

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

[Alexander Tikhonov]

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


Hi Oleg, thanks for the review, as I see the only question why we may need this patch as a temporary solution. The purpose of this patch is to save the stability of the testing code on OSX version, while this is the only way to test it. It can be used in the standalone branch as it is, without pushing to mainline.

  
>Понедельник, 13 апреля 2020, 13:50 +03:00 от Oleg Piskunov <o.piskunov@tarantool.org>:
> 
>Hi,
> 
>Sasha, thanks for the patch. See my comment below.
>  
>>Четверг, 9 апреля 2020, 11:41 +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.
>As far as I remember we agreed to use new HW mac mini for testing 10.15 OSX version.
>I don’t understand why you trying to use VMS for it.
>>
>>Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
>>otherwise it doesn't have the path to brew installed packages.
>>---
>> .gitlab-ci.yml | 11 ++++++-----
>> 1 file changed, 6 insertions(+), 5 deletions(-)
>>
>>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>index cd710027f..5c9f353a7 100644
>>--- a/.gitlab-ci.yml
>>+++ b/.gitlab-ci.yml
>>@@ -139,19 +139,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
>>   <<: *docker_test_definition
>>   tags:
>>     - osx_14
>>--
>>2.17.1
>>  
> 
> 
>--
>Oleg Piskunov
>  
 
 
--
Alexander Tikhonov
 

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

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

[Alexander Tikhonov]

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


Hi Sergey, thanks for the review, please check my comments below.

  
>Пятница, 10 апреля 2020, 17:34 +03:00 от Sergey Bronnikov <sergeyb@tarantool.org>:
> 
>Hi,
>
>Sasha, thanks for the patch. See my comment below.
>
>On 11:40 Thu 09 Apr , Alexander V. Tikhonov wrote:
>> 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.
>>
>> Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
>> otherwise it doesn't have the path to brew installed packages.
>
>PATH can be adjusted in runtime with 'export' call and by using
>user-specific $HOME/.profile and reloading it to current environemnt.
>What are the reasons to touch system-wide file?
Unfortunately we can’t be sure what path is really needed, that is why I used to call
/etc/profile file for PATH setup, by the internal call to special tool ‘/usr/libexec/path_helper’
which can detect needed paths itself. Anyway, may be this way is not clear and better
to use here the script that is needed, that is why I’ve changed the call of /etc/profile to
/usr/libexec/path_helper.
>> Formula tntpython2.rb consist of the packages which download target host
>> does not have valid SSL certificate, disabled curl SSL check for it,
>> also the same issue resolved for pip packages.
>>
>> Github:  https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina-full-ci
>>
>> Alexander V. Tikhonov (2):
>> build: disable at OSX curl SSL
>> gitlab-ci: add Catalina OSX 10.15
>>
>> .gitlab-ci.yml | 11 ++++++-----
>> .travis.mk | 15 +++++++++++++--
>> 2 files changed, 19 insertions(+), 7 deletions(-)
>>
>> --
>> 2.17.1
>>
>
>--
>sergeyb@ 
 
 
--
Alexander Tikhonov
 

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

Re: [Tarantool-patches] [PATCH v1 1/2] build: disable at OSX curl SSL

[Alexander Tikhonov]

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


Hi, Oleg, thanks for the review, please check my comments below.

  
>Понедельник, 13 апреля 2020, 13:57 +03:00 от Oleg Piskunov <o.piskunov@tarantool.org>:
> 
>Hi,
> 
>Sasha, thanks for the patch. See my comment below.
>  
>>Четверг, 9 апреля 2020, 11:41 +03:00 от Alexander V. Tikhonov < avtikhon@tarantool.org >:
>> 
>>Formula tntpython2.rb consist of the packages which download target host
>>does not have valid SSL certificate, disabled curl SSL check for it.
>>---
>> .travis.mk | 15 +++++++++++++--
>> 1 file changed, 13 insertions(+), 2 deletions(-)
>>
>>diff --git a/.travis.mk b/.travis.mk
>>index f709a18b6..e79d50b19 100644
>>--- a/.travis.mk
>>+++ b/.travis.mk
>>@@ -151,7 +151,7 @@ test_static_docker_build:
>> 
>> # since Python 2 is EOL it's latest commit from tapped local formula is used
>> OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
>>- cmake file://${PWD}/tools/brew_taps/tntpython2.rb
>>+ cmake
>*  
>As you move formula from this place, please move above comment as well.
Right, I forgot to move it down, corrected.
>*  
>Would be good to have one line in this place:
>OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake
Unfortunately the string breaks the limit of 80 chars and must be splitted.
>> 
>> deps_osx:
>>  # install brew using command from Homebrew repository instructions:
>>@@ -164,7 +164,18 @@ deps_osx:
>>  # 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}
>>- pip install --force-reinstall -r test-run/requirements.txt
>>+ # Formula tntpython2.rb consist of the packages which download target
>>+ # host does not have valid SSL certificate, disabled curl SSL
>>+ # check for it.
>Above comment really ugly. Please rewrite it more clearly.
Sure, I’ve rewrote it once again.
>>+ echo insecure >>${HOME}/.curlrc
>>+ brew install --force file://${PWD}/tools/brew_taps/tntpython2.rb || true
>>+ sed '$d' ${HOME}/.curlrc >${HOME}/.curlrc.new && \
>>+ mv ${HOME}/.curlrc.new ${HOME}/.curlrc
>>+ python2 -V
>>+ pip install --trusted-host files.pythonhosted.org \
>>+ --upgrade pip setuptools
>>+ pip install --trusted-host files.pythonhosted.org \
>>+ --force-reinstall -r test-run/requirements.txt
>> 
>> build_osx:
>>  cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
>>--
>>2.17.1
>>  
> 
> 
>--
>Oleg Piskunov
>  
 
 
--
Alexander Tikhonov
 

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