From a6a3bf572158b83b306900022d7c0ece11ffd13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 15 Apr 2020 23:26:08 -0400 Subject: [PATCH 1/5] Set default values for RTI_OPENSSL_* to use in test_security. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Connext 5.3.1 requires an older version of openssl which is no longer available from the system macOS installation. Connext supplies a compatible openssl distribution and https://github.com/ros2/system_tests/pull/409 sets up a convention for using it only for the security tests which require it when running with Connext. Signed-off-by: Steven! Ragnarök --- ros2_batch_job/osx_batch/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 479516d5b..6bfd7a2f9 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -57,6 +57,18 @@ def pre(self): warn('OSPL_HOME not set; using default value') os.environ['OSPL_HOME'] = os.path.join( os.environ['HOME'], 'opensplice', 'HDE', 'x86_64.darwin10_clang') + # TODO(nuclearsandwich) remove this when Connext supports system openssl + # https://github.com/ros2/system_tests/pull/409 + if 'RTI_OPENSSL_BIN' not in os.environ: + warn('RTI_OPENSSL_BIN unset; using default value') + os.environ['RTI_OPENSSL_BIN'] = os.path.join( + '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', + 'x64Darwin17clang9.0', 'release', 'bin') + if 'RTI_OPENSSL_LIBS' not in os.environ: + warn('RTI_OPENSSL_LIBS unset; using default value') + os.environ['RTI_OPENSSL_LIBS'] = os.path.join( + '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', + 'x64Darwin17clang9.0', 'release', 'lib') # TODO(wjwwood): remove this when qt5 is linked on macOS by default # See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367 os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \ From d5bc7d3e92c991b03e6b920c376288053370d0d3 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 18 Apr 2020 10:00:35 +0200 Subject: [PATCH 2/5] use homebrew openssl 1.0 Signed-off-by: Mikael Arguedas --- ros2_batch_job/osx_batch/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 6bfd7a2f9..472f10566 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -61,14 +61,16 @@ def pre(self): # https://github.com/ros2/system_tests/pull/409 if 'RTI_OPENSSL_BIN' not in os.environ: warn('RTI_OPENSSL_BIN unset; using default value') - os.environ['RTI_OPENSSL_BIN'] = os.path.join( - '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', - 'x64Darwin17clang9.0', 'release', 'bin') + os.environ['RTI_OPENSSL_BIN'] = '/usr/local/opt/openssl@1.0/bin' + # os.environ['RTI_OPENSSL_BIN'] = os.path.join( + # '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', + # 'x64Darwin17clang9.0', 'release', 'bin') if 'RTI_OPENSSL_LIBS' not in os.environ: warn('RTI_OPENSSL_LIBS unset; using default value') - os.environ['RTI_OPENSSL_LIBS'] = os.path.join( - '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', - 'x64Darwin17clang9.0', 'release', 'lib') + os.environ['RTI_OPENSSL_LIBS'] = '/usr/local/opt/openssl@1.0/lib' + # os.environ['RTI_OPENSSL_LIBS'] = os.path.join( + # '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', + # 'x64Darwin17clang9.0', 'release', 'lib') # TODO(wjwwood): remove this when qt5 is linked on macOS by default # See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367 os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \ From 4741285b43df29fa6c5e8cdfdae3e983dac2b5ef Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 18 Apr 2020 17:11:22 +0200 Subject: [PATCH 3/5] clarify comment Signed-off-by: Mikael Arguedas --- ros2_batch_job/osx_batch/__init__.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 472f10566..c64a7eae4 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -57,20 +57,14 @@ def pre(self): warn('OSPL_HOME not set; using default value') os.environ['OSPL_HOME'] = os.path.join( os.environ['HOME'], 'opensplice', 'HDE', 'x86_64.darwin10_clang') - # TODO(nuclearsandwich) remove this when Connext supports system openssl - # https://github.com/ros2/system_tests/pull/409 + # TODO(nuclearsandwich) COnnext 5.3.1 supports only OpenSSL 1.0.2 + # remove this when upgrading to Connext 6 that supports OpenSSL 1.1.1 if 'RTI_OPENSSL_BIN' not in os.environ: warn('RTI_OPENSSL_BIN unset; using default value') os.environ['RTI_OPENSSL_BIN'] = '/usr/local/opt/openssl@1.0/bin' - # os.environ['RTI_OPENSSL_BIN'] = os.path.join( - # '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', - # 'x64Darwin17clang9.0', 'release', 'bin') if 'RTI_OPENSSL_LIBS' not in os.environ: warn('RTI_OPENSSL_LIBS unset; using default value') os.environ['RTI_OPENSSL_LIBS'] = '/usr/local/opt/openssl@1.0/lib' - # os.environ['RTI_OPENSSL_LIBS'] = os.path.join( - # '/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n', - # 'x64Darwin17clang9.0', 'release', 'lib') # TODO(wjwwood): remove this when qt5 is linked on macOS by default # See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367 os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \ From 0cf36b01febf69c6dcd8d00181ae9bac23b5eaad Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Wed, 17 Jun 2020 00:03:58 +0200 Subject: [PATCH 4/5] update path to rti openssl Signed-off-by: Mikael Arguedas --- ros2_batch_job/osx_batch/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index c64a7eae4..750a7807e 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -61,10 +61,10 @@ def pre(self): # remove this when upgrading to Connext 6 that supports OpenSSL 1.1.1 if 'RTI_OPENSSL_BIN' not in os.environ: warn('RTI_OPENSSL_BIN unset; using default value') - os.environ['RTI_OPENSSL_BIN'] = '/usr/local/opt/openssl@1.0/bin' + os.environ['RTI_OPENSSL_BIN'] = '/Users/osrf/openssl-1.0.2n/x64Darwin17clang9.0/release/bin' if 'RTI_OPENSSL_LIBS' not in os.environ: warn('RTI_OPENSSL_LIBS unset; using default value') - os.environ['RTI_OPENSSL_LIBS'] = '/usr/local/opt/openssl@1.0/lib' + os.environ['RTI_OPENSSL_LIBS'] = '/Users/osrf/openssl-1.0.2n/x64Darwin17clang9.0/release/lib' # TODO(wjwwood): remove this when qt5 is linked on macOS by default # See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367 os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \ From 2a0eccd85e6fce5d73e3ae0b046a439b9a3d1528 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Wed, 17 Jun 2020 22:10:33 +0200 Subject: [PATCH 5/5] typo Signed-off-by: Mikael Arguedas --- ros2_batch_job/osx_batch/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 750a7807e..b492723a7 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -57,7 +57,7 @@ def pre(self): warn('OSPL_HOME not set; using default value') os.environ['OSPL_HOME'] = os.path.join( os.environ['HOME'], 'opensplice', 'HDE', 'x86_64.darwin10_clang') - # TODO(nuclearsandwich) COnnext 5.3.1 supports only OpenSSL 1.0.2 + # TODO(nuclearsandwich) Connext 5.3.1 supports only OpenSSL 1.0.2 # remove this when upgrading to Connext 6 that supports OpenSSL 1.1.1 if 'RTI_OPENSSL_BIN' not in os.environ: warn('RTI_OPENSSL_BIN unset; using default value')