test: Adding help message for --keep-cluster and updating versions

* Removed requirement for keep cluster to have a value; it was meant to
  be a toggle originally.

Author: Michael Fero

gtests/src/integration/options.cpp

@@ -23,8 +23,8 @@
 #include <algorithm>
 #include <iostream>
 
-#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.2")
-#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.0.1")
+#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.3")
+#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.0.3")
 
 // Initialize the defaults for all the options
 bool Options::is_initialized_ = false;
@@ -87,14 +87,9 @@ bool Options::initialize(int argc, char* argv[]) {
       }
       // Integration test options
       if (key.compare("--keep-clusters") == 0) {
-        if (!value.empty()) {
-          is_keep_clusters_ = bool_value(value);
-        }
-        else {
-          std::cerr << "Missing Keep Cluster(s) Boolean: Using default " << is_keep_clusters_ << std::endl;
-        }
+        is_keep_clusters_ = true;
       }
-      if (key.compare("--log-tests") == 0) {
+      else if (key.compare("--log-tests") == 0) {
         if (!value.empty()) {
           is_log_tests_ = bool_value(value);
         } else {
@@ -306,10 +301,10 @@ void Options::print_help() {
     << "Password to use for DSE download authentication." << std::endl;
   std::cout << "  --git" << std::endl << "      "
     << "Indicate Cassandra/DSE server download should be obtained from" << std::endl
-    << "     ASF/GitHub." << std::endl;
+    << "      ASF/GitHub." << std::endl;
   std::cout << "  --git=[BRANCH_OR_TAG]" << std::endl << "      "
     << "Indicate Cassandra/DSE server branch/tag should be obtained from" << std::endl
-    <<"      ASF/GitHub." << std::endl;
+    << "      ASF/GitHub." << std::endl;
   std::cout << "  --install-dir=[INSTALL_DIR]" << std::endl << "      "
     << "Indicate Cassandra/DSE installation directory to use." << std::endl;
   std::cout << "  --prefix=[PREFIX]" << std::endl << "      "
@@ -335,6 +330,9 @@ void Options::print_help() {
     << "Private key filename to use for remote deployment. The default is" << std::endl
     << "      " << private_key() << "." << std::endl;
 #endif
+  std::cout << "  --keep-clusters" << std::endl << "      "
+    << "Indicate CCM clusters should not be removed after tests terminate."
+    << std::endl;
   std::cout << std::endl;
 }
 

test/ccm_bridge/data/config.txt

@@ -13,7 +13,7 @@
 #
 # Uncomment to specify Cassandra version
 ##
-#CASSANDRA_VERSION=3.11.1
+#CASSANDRA_VERSION=3.11.3
 ##
 # Flag to determine if Cassandra/DSE version should be obtained from ASF/GitHub
 #
@@ -64,7 +64,7 @@
 #
 # Uncomment to specify DSE version
 ##
-#DSE_VERSION=6.0.1
+#DSE_VERSION=6.0.3
 ##
 # CCM DSE Credentials Type (username_password|ini_file)
 #

test/ccm_bridge/src/bridge.hpp

@@ -43,8 +43,8 @@ typedef struct _LIBSSH2_CHANNEL LIBSSH2_CHANNEL;
 #endif
 
 // Default values
-#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.2")
-#define DEFAULT_DSE_VERSION DseVersion("6.0.1")
+#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.3")
+#define DEFAULT_DSE_VERSION DseVersion("6.0.3")
 #define DEFAULT_USE_GIT false
 #define DEFAULT_USE_INSTALL_DIR false
 #define DEFAULT_USE_DSE false