From 510b2775d8db427bd3935ea823fef93c34ef86e3 Mon Sep 17 00:00:00 2001 From: Michael Penick Date: Tue, 29 Sep 2020 10:19:31 -0400 Subject: [PATCH 1/2] Remove OSX from CI --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c25b3c357..2216b9b05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -614,8 +614,7 @@ pipeline { 'centos/8-64/cpp', 'ubuntu/trusty64/cpp', 'ubuntu/xenial64/cpp', - 'ubuntu/bionic64/cpp', - 'osx/high-sierra' + 'ubuntu/bionic64/cpp' } } From c1b0d32cae280a770273b73a1db59e63de2d4bf2 Mon Sep 17 00:00:00 2001 From: Michael Penick Date: Fri, 6 Nov 2020 13:29:42 -0500 Subject: [PATCH 2/2] Fix DSE integration test version --- tests/src/integration/ccm/cass_version.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/src/integration/ccm/cass_version.hpp b/tests/src/integration/ccm/cass_version.hpp index f0dd9c9dc..1db957266 100644 --- a/tests/src/integration/ccm/cass_version.hpp +++ b/tests/src/integration/ccm/cass_version.hpp @@ -496,11 +496,7 @@ class DseVersion : public CassVersion { } else if (*this == "5.1.16") { return CassVersion("3.11.4-5116"); } else if (*this >= "5.1.17" && *this < "6.0.0") { - if (*this > "5.1.17") { - std::cerr << "Cassandra Version is not Defined: " - << "Add Cassandra version for DSE v" << this->to_string() << std::endl; - } - return CassVersion("3.11.4-5117"); + return CassVersion("3.11.4"); } else if (*this >= "6.0.0" && *this < "6.7.0") { return CassVersion( "3.11.2-5111"); // Versions before DSE 6.7 erroneously return they support Cassandra 4.0.0