Update docker.io/scylladb/scylla Docker tag to v6 (#9429)

* Update docker.io/scylladb/scylla Docker tag to v6 * Apply change from #9397 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Robert Stupp <[email protected]>
projectnessie · Aug 28, 2024 · 93b16ad · 93b16ad
1 parent 1c326b5
commit 93b16ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.../projectnessie/versioned/storage/cassandra2tests/AbstractCassandraBackendTestFactory.java b/.../projectnessie/versioned/storage/cassandra2tests/AbstractCassandraBackendTestFactory.java
@@ -81,10 +81,15 @@ private void maybeCreateKeyspace(CqlSession session) {
             .map(dc -> format("'%s': %d", dc, replicationFactor))
             .collect(Collectors.joining(", "));
 
+    // Disable tablets in ScyllaDB, because those are not compatible with LWTs (yet?). See
+    // https://opensource.docs.scylladb.com/stable/architecture/tablets.html#limitations-and-unsupported-features
+    String scyllaClause = "scylladb".equals(dbName) ? " AND tablets = {'enabled': false}" : "";
+
     session.execute(
         format(
-            "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class': 'NetworkTopologyStrategy', %s};",
-            KEYSPACE_FOR_TEST, datacenters));
+            "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = {'class': 'NetworkTopologyStrategy', %s}%s;",
+            KEYSPACE_FOR_TEST, datacenters, scyllaClause));
+
     session.refreshSchema();
   }
 

diff --git a/...resources/org/projectnessie/versioned/storage/cassandra2tests/Dockerfile-scylladb-version b/...resources/org/projectnessie/versioned/storage/cassandra2tests/Dockerfile-scylladb-version
@@ -1,3 +1,3 @@
 # Dockerfile to provide the image name and tag to a test.
 # Version is managed by Renovate - do not edit.
-FROM docker.io/scylladb/scylla:5.4.9
+FROM docker.io/scylladb/scylla:6.1.0