Skip to content

Commit 13fe12a

Browse files
dkropachevdkropachev
committed
tests: remove ccm.scylla cli option
This option collides with ccm.distribution that was introduced in `4.18.0.0`. Let's remove it to keep code clean.
1 parent 8af25f5 commit 13fe12a

File tree

12 files changed

+59
-44
lines changed

12 files changed

+59
-44
lines changed

‎.github/workflows/[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ jobs:
351351

352352
- name: Run integration tests on Scylla (${{ steps.scylla-version.outputs.value }})
353353
id: run-integration-tests
354-
run: mvn -B verify -Dccm.version=${{ steps.scylla-version.outputs.value }} -Dccm.scylla=true -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
354+
run: mvn -B verify -Dccm.version=${{ steps.scylla-version.outputs.value }} -Dccm.distribution=scylla -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
355355

356356
- name: Copy test results
357357
if: steps.run-integration-tests.outcome == 'failure'

‎integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
4242
import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
4343
import com.datastax.oss.driver.api.testinfra.ccm.SchemaChangeSynchronizer;
44+
import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
4445
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
4546
import com.datastax.oss.driver.categories.ParallelizableTests;
4647
import com.datastax.oss.driver.internal.core.cql.EmptyColumnDefinitions;
@@ -183,7 +184,8 @@ public void should_write() {
183184

184185
@Test
185186
public void should_write_cas() {
186-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
187+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
188+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
187189

188190
SimpleStatement statement =
189191
SimpleStatement.builder(
@@ -243,7 +245,8 @@ public void should_write_cas() {
243245

244246
@Test
245247
public void should_write_batch_cas() {
246-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
248+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
249+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
247250

248251
BatchStatement batch = createCASBatch();
249252
CqlSession session = sessionRule.session();

‎integration-tests/src/test/java/com/datastax/oss/driver/core/loadbalancing/LWTLoadBalancingIT.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
3939
import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
4040
import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
41+
import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
4142
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
4243
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
4344
import java.nio.ByteBuffer;
@@ -76,7 +77,8 @@ public static void setup() {
7677

7778
@Test
7879
public void should_use_only_one_node_when_lwt_detected() {
79-
assumeTrue(CcmBridge.SCYLLA_ENABLEMENT); // Functionality only available in Scylla
80+
assumeTrue(
81+
CcmBridge.isDistributionOf(BackendType.SCYLLA)); // Functionality only available in Scylla
8082
CqlSession session = SESSION_RULE.session();
8183
int pk = 1234;
8284
ByteBuffer routingKey = TypeCodecs.INT.encodePrimitive(pk, ProtocolVersion.DEFAULT);
@@ -97,7 +99,7 @@ public void should_use_only_one_node_when_lwt_detected() {
9799
// Sanity check for the previous test - non-LWT queries should
98100
// not always be sent to same node
99101
public void should_not_use_only_one_node_when_non_lwt() {
100-
assumeTrue(CcmBridge.SCYLLA_ENABLEMENT);
102+
assumeTrue(CcmBridge.isDistributionOf(BackendType.SCYLLA));
101103
CqlSession session = SESSION_RULE.session();
102104
int pk = 1234;
103105
PreparedStatement statement = session.prepare("INSERT INTO foo (pk, ck, v) VALUES (?, ?, ?)");
@@ -114,7 +116,8 @@ public void should_not_use_only_one_node_when_non_lwt() {
114116

115117
@Test
116118
public void should_use_only_one_node_when_lwt_batch_detected() {
117-
assumeTrue(CcmBridge.SCYLLA_ENABLEMENT); // Functionality only available in Scylla
119+
assumeTrue(
120+
CcmBridge.isDistributionOf(BackendType.SCYLLA)); // Functionality only available in Scylla
118121
CqlSession session = SESSION_RULE.session();
119122
int pk = 1234;
120123
ByteBuffer routingKey = TypeCodecs.INT.encodePrimitive(pk, ProtocolVersion.DEFAULT);

‎integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaChangesIT.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ public void should_handle_type_update() {
250250
public void should_handle_view_creation() {
251251
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V3_0_0) >= 0)
252252
.isTrue();
253-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
253+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
254+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
254255
should_handle_creation(
255256
"CREATE TABLE scores(user text, game text, score int, PRIMARY KEY (user, game))",
256257
"CREATE MATERIALIZED VIEW highscores "
@@ -325,7 +326,7 @@ public void should_handle_view_update() {
325326
public void should_handle_function_creation() {
326327
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
327328
.isTrue();
328-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
329+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
329330
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
330331
should_handle_creation(
331332
null,
@@ -351,7 +352,7 @@ public void should_handle_function_creation() {
351352
public void should_handle_function_drop() {
352353
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
353354
.isTrue();
354-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
355+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
355356
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
356357
should_handle_drop(
357358
ImmutableList.of(
@@ -369,7 +370,7 @@ public void should_handle_function_drop() {
369370
public void should_handle_function_update() {
370371
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
371372
.isTrue();
372-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
373+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
373374
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
374375
should_handle_update_via_drop_and_recreate(
375376
ImmutableList.of(
@@ -391,7 +392,7 @@ public void should_handle_function_update() {
391392
public void should_handle_aggregate_creation() {
392393
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
393394
.isTrue();
394-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
395+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
395396
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
396397
should_handle_creation(
397398
"CREATE FUNCTION plus(i int, j int) RETURNS NULL ON NULL INPUT RETURNS int "
@@ -419,7 +420,7 @@ public void should_handle_aggregate_creation() {
419420
public void should_handle_aggregate_drop() {
420421
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
421422
.isTrue();
422-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
423+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
423424
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
424425
should_handle_drop(
425426
ImmutableList.of(
@@ -438,7 +439,7 @@ public void should_handle_aggregate_drop() {
438439
public void should_handle_aggregate_update() {
439440
assumeThat(CCM_RULE.getCcmBridge().getCassandraVersion().compareTo(Version.V2_2_0) >= 0)
440441
.isTrue();
441-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT)
442+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
442443
.isFalse(); // @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUDF
443444
should_handle_update_via_drop_and_recreate(
444445
ImmutableList.of(

‎integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/ZeroTokenNodesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.datastax.oss.driver.api.core.metadata.EndPoint;
1212
import com.datastax.oss.driver.api.core.metadata.Node;
1313
import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
14+
import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
1415
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
1516
import java.net.InetAddress;
1617
import java.net.InetSocketAddress;
@@ -31,7 +32,7 @@ public void checkScyllaVersion() {
3132
// Zero-token nodes introduced in scylladb/scylladb#19684
3233
// 2025.1 is an estimated future version and it still may not have this change in.
3334
// This number may need to be adjusted once CI picks up this test.
34-
assumeTrue(CcmBridge.SCYLLA_ENABLEMENT);
35+
assumeTrue(CcmBridge.isDistributionOf(BackendType.SCYLLA));
3536
if (CcmBridge.SCYLLA_ENTERPRISE) {
3637
assumeTrue(
3738
CcmBridge.VERSION.compareTo(Objects.requireNonNull(Version.parse("2025.1.0"))) >= 0);

‎integration-tests/src/test/java/com/datastax/oss/driver/mapper/InsertIT.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.datastax.oss.driver.api.mapper.entity.saving.NullSavingStrategy;
4545
import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
4646
import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
47+
import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
4748
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
4849
import com.datastax.oss.driver.categories.ParallelizableTests;
4950
import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
@@ -229,7 +230,8 @@ public void should_insert_entity_with_bound_timestamp_asynchronously() {
229230

230231
@Test
231232
public void should_insert_entity_if_not_exists() {
232-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
233+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
234+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
233235
assertThat(dao.saveIfNotExists(FLAMETHROWER)).isNull();
234236

235237
Product otherProduct =
@@ -248,7 +250,8 @@ public void should_insert_entity_if_not_exists_returning_boolean() {
248250

249251
@Test
250252
public void should_insert_entity_if_not_exists_asynchronously() {
251-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
253+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
254+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
252255
assertThat(CompletableFutures.getUninterruptibly(dao.saveAsyncIfNotExists(FLAMETHROWER)))
253256
.isNull();
254257

@@ -275,7 +278,8 @@ public void should_insert_entity_if_not_exists_asynchronously_returning_boolean(
275278

276279
@Test
277280
public void should_insert_entity_if_not_exists_returning_optional() {
278-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
281+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
282+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
279283
assertThat(dao.saveIfNotExistsOptional(FLAMETHROWER)).isEmpty();
280284

281285
Product otherProduct =
@@ -285,7 +289,8 @@ public void should_insert_entity_if_not_exists_returning_optional() {
285289

286290
@Test
287291
public void should_insert_entity_if_not_exists_returning_optional_asynchronously() {
288-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
292+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
293+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
289294
assertThat(
290295
CompletableFutures.getUninterruptibly(dao.saveAsyncIfNotExistsOptional(FLAMETHROWER)))
291296
.isEmpty();

‎integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ protected static boolean isSasiBroken(BaseCcmRule ccmRule) {
112112

113113
protected static boolean supportsSASI(BaseCcmRule ccmRule) {
114114
return ccmRule.getCassandraVersion().compareTo(MINIMUM_SASI_VERSION) >= 0
115-
&& !CcmBridge
116-
.SCYLLA_ENABLEMENT /* @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUnsupportedFunctionality @IntegrationTestDisabledScyllaUnsupportedIndex */;
115+
&& !CcmBridge.isDistributionOf(
116+
BackendType
117+
.SCYLLA) /* @IntegrationTestDisabledScyllaFailure @IntegrationTestDisabledScyllaUnsupportedFunctionality @IntegrationTestDisabledScyllaUnsupportedIndex */;
117118
}
118119

119120
@Entity

‎integration-tests/src/test/java/com/datastax/oss/driver/mapper/SchemaValidationIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ public void should_log_warn_when_entity_has_no_corresponding_cql_table() {
206206

207207
@Test
208208
public void should_throw_general_driver_exception_when_schema_validation_check_is_disabled() {
209-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
209+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
210+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
210211
// @IntegrationTestDisabledScyllaDifferentText
211212
assertThatThrownBy(
212213
() -> mapperDisabledValidation.productDaoValidationDisabled(sessionRule.keyspace()))

‎integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectOtherClausesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ public void should_select_with_limit() {
111111

112112
@Test
113113
public void should_select_with_per_partition_limit() {
114-
assumeThat(CcmBridge.SCYLLA_ENABLEMENT).isFalse(); // @IntegrationTestDisabledScyllaFailure
114+
assumeThat(CcmBridge.isDistributionOf(BackendType.SCYLLA))
115+
.isFalse(); // @IntegrationTestDisabledScyllaFailure
115116

116117
PagingIterable<Simple> elements = dao.selectWithPerPartitionLimit(5);
117118
assertThat(elements.isFullyFetched()).isTrue();

‎osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/CcmPaxExam.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
2424
import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
2525
import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirementRule;
26+
import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
2627
import java.util.Objects;
2728
import java.util.Optional;
2829
import org.junit.AssumptionViolatedException;
@@ -110,11 +111,11 @@ private void fireRequirementsNotMet(
110111
String.format(
111112
"Test requires %s %s %s but %s is configured. Description: %s",
112113
lessThan ? "less than" : "at least",
113-
dse ? "DSE" : (CcmBridge.SCYLLA_ENABLEMENT ? "SCYLLA" : "C*"),
114+
dse ? "DSE" : (CcmBridge.isDistributionOf(BackendType.SCYLLA) ? "SCYLLA" : "C*"),
114115
requirement,
115116
dse
116117
? CCM_BRIDGE.getDseVersion().orElse(null)
117-
: (CcmBridge.SCYLLA_ENABLEMENT
118+
: (CcmBridge.isDistributionOf(BackendType.SCYLLA)
118119
? CCM_BRIDGE.getScyllaVersion().orElse(null)
119120
: CCM_BRIDGE.getCassandraVersion()),
120121
description));

‎test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ public void evaluate() {
7777
String.format(
7878
"Test requires %s %s %s but %s is configured. Description: %s",
7979
lessThan ? "less than" : "at least",
80-
dse ? "DSE" : (CcmBridge.SCYLLA_ENABLEMENT ? "SCYLLA" : "C*"),
80+
dse ? "DSE" : (CcmBridge.isDistributionOf(BackendType.SCYLLA) ? "SCYLLA" : "C*"),
8181
requirement,
8282
dse
8383
? ccmBridge.getDseVersion().orElse(null)
84-
: (CcmBridge.SCYLLA_ENABLEMENT
84+
: (CcmBridge.isDistributionOf(BackendType.SCYLLA)
8585
? ccmBridge.getScyllaVersion().orElse(null)
8686
: ccmBridge.getCassandraVersion()),
8787
description));
@@ -97,7 +97,7 @@ public Statement apply(Statement base, Description description) {
9797
// Scylla-specific annotations
9898
ScyllaSkip scyllaSkip = description.getAnnotation(ScyllaSkip.class);
9999
if (scyllaSkip != null) {
100-
if (CcmBridge.SCYLLA_ENABLEMENT) {
100+
if (CcmBridge.isDistributionOf(BackendType.SCYLLA)) {
101101
return new Statement() {
102102

103103
@Override
@@ -112,7 +112,7 @@ public void evaluate() {
112112

113113
CassandraSkip cassandraSkip = description.getAnnotation(CassandraSkip.class);
114114
if (cassandraSkip != null) {
115-
if (!CcmBridge.SCYLLA_ENABLEMENT) {
115+
if (!CcmBridge.isDistributionOf(BackendType.SCYLLA)) {
116116
return new Statement() {
117117

118118
@Override

‎test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ public class CcmBridge implements AutoCloseable {
6767
BackendType.valueOf(
6868
System.getProperty("ccm.distribution", BackendType.CASSANDRA.name()).toUpperCase());
6969

70-
public static final Boolean SCYLLA_ENABLEMENT = Boolean.getBoolean("ccm.scylla");
71-
7270
public static final String CCM_VERSION_PROPERTY = System.getProperty("ccm.version", "4.0.0");
7371

7472
public static final Version VERSION = Objects.requireNonNull(parseCcmVersion());
@@ -150,13 +148,8 @@ public class CcmBridge implements AutoCloseable {
150148

151149
static {
152150
Map<String, String> envMap = Maps.newHashMap(new ProcessBuilder().environment());
153-
if (SCYLLA_ENABLEMENT) {
154-
LOG.debug("Overriding distribution variable because 'ccm.scylla = true' was passed");
155-
DISTRIBUTION = BackendType.SCYLLA;
156-
157-
if (SCYLLA_ENTERPRISE) {
158-
envMap.put("SCYLLA_PRODUCT", "enterprise");
159-
}
151+
if (isDistributionOf(BackendType.SCYLLA) && SCYLLA_ENTERPRISE) {
152+
envMap.put("SCYLLA_PRODUCT", "enterprise");
160153
}
161154
LOG.info("CCM Bridge configured with {} version {}", DISTRIBUTION.getFriendlyName(), VERSION);
162155

@@ -260,7 +253,9 @@ private static Version parseCcmVersion() {
260253
CommandLine.parse(
261254
String.format(
262255
"ccm create get_version -n 1 %s --version %s --config-dir=%s",
263-
(SCYLLA_ENABLEMENT ? "--scylla" : " "), versionString, configDir)));
256+
(isDistributionOf(BackendType.SCYLLA) ? "--scylla" : " "),
257+
versionString,
258+
configDir)));
264259
String output =
265260
execute(
266261
CommandLine.parse(
@@ -281,11 +276,13 @@ private static Version parseCcmVersion() {
281276
}
282277

283278
public Optional<Version> getScyllaVersion() {
284-
return SCYLLA_ENABLEMENT ? Optional.of(VERSION) : Optional.empty();
279+
return isDistributionOf(BackendType.SCYLLA) ? Optional.of(VERSION) : Optional.empty();
285280
}
286281

287282
public Optional<String> getScyllaUnparsedVersion() {
288-
return SCYLLA_ENABLEMENT ? Optional.of(System.getProperty("ccm.version")) : Optional.empty();
283+
return isDistributionOf(BackendType.SCYLLA)
284+
? Optional.of(System.getProperty("ccm.version"))
285+
: Optional.empty();
289286
}
290287

291288
public Optional<Version> getDseVersion() {
@@ -321,7 +318,7 @@ private String getCcmVersionString(String propertyString) {
321318
// If parseCcmVersion has not failed execution it should be usable.
322319
return propertyString;
323320
}
324-
if (SCYLLA_ENABLEMENT) {
321+
if (isDistributionOf(BackendType.SCYLLA)) {
325322
// Scylla OSS versions before 5.1 had RC versioning scheme of 5.0.rc3.
326323
// Scylla OSS versions after (and including 5.1) have RC versioning of 5.1.0-rc3.
327324
// A similar situation occurs with Scylla Enterprise after 2022.2.
@@ -382,7 +379,8 @@ public void create() {
382379

383380
Version cassandraVersion = getCassandraVersion();
384381

385-
if (cassandraVersion.compareTo(Version.V2_2_0) >= 0 && !SCYLLA_ENABLEMENT) {
382+
if (cassandraVersion.compareTo(Version.V2_2_0) >= 0
383+
&& !isDistributionOf(BackendType.SCYLLA)) {
386384
// @IntegrationTestDisabledScyllaJVMArgs @IntegrationTestDisabledScyllaUDF
387385
cassandraConfiguration.put("enable_user_defined_functions", "true");
388386
}
@@ -723,7 +721,7 @@ public Builder withCreateOption(String option) {
723721
/** Enables SSL encryption. */
724722
public Builder withSsl() {
725723
cassandraConfiguration.put("client_encryption_options.enabled", "true");
726-
if (SCYLLA_ENABLEMENT) {
724+
if (isDistributionOf(BackendType.SCYLLA)) {
727725
cassandraConfiguration.put(
728726
"client_encryption_options.certificate",
729727
DEFAULT_SERVER_CERT_CHAIN_FILE.getAbsolutePath());
@@ -756,7 +754,7 @@ public Builder withSslLocalhostCn() {
756754
public Builder withSslAuth() {
757755
withSsl();
758756
cassandraConfiguration.put("client_encryption_options.require_client_auth", "true");
759-
if (SCYLLA_ENABLEMENT) {
757+
if (isDistributionOf(BackendType.SCYLLA)) {
760758
cassandraConfiguration.put(
761759
"client_encryption_options.truststore",
762760
DEFAULT_SERVER_TRUSTSTORE_PEM_FILE.getAbsolutePath());

0 commit comments

Comments
 (0)