Update tests for 4.1

k8ssandra · Jul 14, 2023 · b4a855c · b4a855c
1 parent 2d17ead
commit b4a855c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java b/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
@@ -276,6 +276,7 @@ public void testResetLocalSchema() throws IOException, URISyntaxException {
     assumeTrue(IntegrationTestUtils.shouldRun());
     // Reset schema does not work on Cassandra 4.1+
     assumeFalse("4_1".equals(this.version));
+    assumeFalse("4_1_ubi".equals(this.version));
     assumeFalse("trunk".equals(this.version));
     ensureStarted();
 

diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/DockerHelper.java b/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/DockerHelper.java
@@ -424,12 +424,16 @@ static DockerBuildConfig getConfig(String version, List<String> envVars) {
         case "4_1":
           config.dockerFile = Paths.get(config.baseDir.getPath(), "Dockerfile-4_1").toFile();
           config.target = "oss41";
-          config.envList = Lists.newArrayList("MAX_HEAP_SIZE=500M", "HEAP_NEWSIZE=100M");
+          config.envList =
+              Lists.newArrayList(
+                  "MAX_HEAP_SIZE=500M", "HEAP_NEWSIZE=100M", "MGMT_API_DISABLE_MCAC=true");
           break;
         case "4_1_ubi":
           config.dockerFile = Paths.get(config.baseDir.getPath(), "Dockerfile-4_1.ubi8").toFile();
           config.target = "oss41";
-          config.envList = Lists.newArrayList("MAX_HEAP_SIZE=500M", "HEAP_NEWSIZE=100M");
+          config.envList =
+              Lists.newArrayList(
+                  "MAX_HEAP_SIZE=500M", "HEAP_NEWSIZE=100M", "MGMT_API_DISABLE_MCAC=true");
           break;
         case "trunk":
           config.dockerFile =