SERVER-37529 Fix issues for ssl_ECDHE_suites.js on non x86 evergreen machines

3 files changed, 18 insertions, 10 deletions

diff --git a/etc/pip/components/platform.req b/etc/pip/components/platform.req
index 1db74332876..324995955fa 100644
--- a/etc/pip/components/platform.req
+++ b/etc/pip/components/platform.req
@@ -3,4 +3,6 @@ pypiwin32==219; sys_platform == "win32" and python_version < "3"
 pypiwin32==223; sys_platform == "win32" and python_version > "3"
 subprocess32==3.5.2; os_name == "posix" and platform_release != "2.6.18-194.el5xen" and platform_release != "2.6.18-274.el5xen" and python_version < "3"
 # Needed for ssl_ECDHE_suites.js test - testing the TLS suites enabled on each platform
-sslyze==2.0.1; python_version >= "3.6" and sys_platform != "darwin"
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "win32" and (platform_machine == "x86_64" or  platform_machine == "AMD64")
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "cygwin" and (platform_machine == "x86_64" or platform_machine == "AMD64")
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "linux" and (platform_machine == "x86_64" or platform_machine == "i686")
diff --git a/etc/pip/constraints.txt b/etc/pip/constraints.txt
index 7748510c3a1..8176b262b8a 100644
--- a/etc/pip/constraints.txt
+++ b/etc/pip/constraints.txt
@@ -6,8 +6,8 @@
 
 # Common requirements
 asn1crypto==0.24.0
-boto3==1.9.16
-botocore==1.12.16
+boto3==1.9.21
+botocore==1.12.21
 certifi==2018.8.24
 cffi==1.11.5
 chardet==3.0.4
@@ -69,4 +69,6 @@ pypiwin32==219; sys_platform == "win32" and python_version < "3"
 pypiwin32==223; sys_platform == "win32" and python_version > "3"
 subprocess32==3.5.2; os_name == "posix" and platform_release != "2.6.18-194.el5xen" and platform_release != "2.6.18-274.el5xen" and python_version < "3"
 # Needed for ssl_ECDHE_suites.js test - testing the TLS suites enabled on each platform
-sslyze==2.0.1; python_version >= "3.6" and sys_platform != "darwin"
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "win32" and (platform_machine == "x86_64" or  platform_machine == "AMD64")
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "cygwin" and (platform_machine == "x86_64" or platform_machine == "AMD64")
+sslyze==2.0.1; python_version >= "3.6" and sys_platform == "linux" and (platform_machine == "x86_64" or platform_machine == "i686")
diff --git a/jstests/ssl/ssl_ECDHE_suites.js b/jstests/ssl/ssl_ECDHE_suites.js
index ebcaa6fc7a3..d3f65a867bf 100644
--- a/jstests/ssl/ssl_ECDHE_suites.js
+++ b/jstests/ssl/ssl_ECDHE_suites.js
@@ -5,10 +5,6 @@ load('jstests/ssl/libs/ssl_helpers.js');
 (function() {
     "use strict";
 
-    if (getBuildInfo().buildEnvironment.target_os === "macOS") {
-        return;
-    }
-
     const suites = [
         "SSLV2 Cipher Suites",
         "SSLV3 Cipher Suites",
@@ -20,6 +16,13 @@ load('jstests/ssl/libs/ssl_helpers.js');
     const SERVER_CERT = "jstests/libs/server.pem";
 
     function runSSLYze(port) {
+        let target_os = buildInfo().buildEnvironment.target_os;
+        let target_arch = buildInfo().buildEnvironment.target_arch;
+
+        if (target_os === "macOS" || target_arch !== "x86_64") {
+            return null;
+        }
+
         let python = "/usr/bin/env python3";
         let sslyze = " jstests/ssl/sslyze_tester.py ";
 
@@ -86,8 +89,9 @@ load('jstests/ssl/libs/ssl_helpers.js');
         };
         let mongod = MongoRunner.runMongod(x509_options);
         var cipherDict = runSSLYze(mongod.port);
-        testSSLYzeOutput(cipherDict);
-
+        if (cipherDict !== null) {
+            testSSLYzeOutput(cipherDict);
+        }
         MongoRunner.stopMongod(mongod);
     }
 }());
\ No newline at end of file