scylladb/scylla-cpp-driver-matrix

patch for datastax 2.17.0 is broken

Closed this issue · 0 comments

fruch commented

we need to fix the patch for version 2.17.0

Traceback (most recent call last):
  File "/jenkins/workspace/scylla-master/driver-tests/cpp-driver-matrix-test/cpp-driver-matrix/main.py", line 29, in main
    results[version] = test_run.run()
                       ^^^^^^^^^^^^^^
  File "/jenkins/workspace/scylla-master/driver-tests/cpp-driver-matrix-test/cpp-driver-matrix/run.py", line 136, in run
    if not self._apply_patch_files():
           ^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/jenkins/workspace/scylla-master/driver-tests/cpp-driver-matrix-test/cpp-driver-matrix/run.py", line 101, in _apply_patch_files
    self._run_command_in_shell(f"git apply -v --check {file_path}")
  File "/jenkins/workspace/scylla-master/driver-tests/cpp-driver-matrix-test/cpp-driver-matrix/run.py", line 90, in _run_command_in_shell
    assert status_code == 0, stderr
           ^^^^^^^^^^^^^^^^
AssertionError: /bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
Checking patch src/random.cpp...
Checking patch tests/src/integration/ccm/bridge.cpp...
error: while searching for:
    }
  }

  // Create Cassandra version specific updated (C* 2.2+)
  if (cassandra_version >= "2.2.0") {
    updateconf_command.push_back("enable_user_defined_functions:true");
  }

  // Create Cassandra version specific updated (C* 3.0+)
  if (cassandra_version >= "3.0.0") {
    updateconf_command.push_back("enable_scripted_user_defined_functions:true");
  }

  return updateconf_command;
}

error: patch failed: tests/src/integration/ccm/bridge.cpp:1481
error: tests/src/integration/ccm/bridge.cpp: patch does not apply
Checking patch tests/src/integration/ccm/bridge.hpp...
Checking patch tests/src/integration/integration.cpp...
Hunk #1 succeeded at 155 (offset -1 lines).
Checking patch tests/src/integration/options.cpp...
error: while searching for:
bool Options::is_verbose_ccm_ = false;
bool Options::is_verbose_integration_ = false;
bool Options::is_beta_protocol_ = true;

// Static initialization is not guaranteed for the following types
CCM::DseCredentialsType Options::dse_credentials_type_;

error: patch failed: tests/src/integration/options.cpp:49
error: tests/src/integration/options.cpp: patch does not apply
Checking patch tests/src/integration/options.hpp...
error: while searching for:
   * @return True if beta protocol should be enabled; false otherwise
   */
  static bool is_beta_protocol();
  /**
   * Get a CCM instance based on the options
   *

error: patch failed: tests/src/integration/options.hpp:233
error: tests/src/integration/options.hpp: patch does not apply