>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21228?usp=email )
Change subject: [NO ISSUE][OTH] Fix container name in test
......................................................................
[NO ISSUE][OTH] Fix container name in test
- user model changes: no
- storage format changes: no
- interface changes: no
Ext-ref: MB-68099
Change-Id: I10ea8fe99f81ffacdcd302fe7cad47f139b920f1
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/28/21228/1
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
index 9b366da..1d23490 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
@@ -29,6 +29,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;
+import java.util.UUID;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -90,7 +91,8 @@
// Starting S3 mock server to be used instead of real S3 server
LOGGER.info("Starting S3 mock server");
s3Mock = new
S3MockContainer(S3MOCK_VERSION_TAG).withRetainFilesOnExit(!cleanStart)
- .withCreateContainerCmdModifier(cmd ->
cmd.withName(S3MOCK_CONTAINER_NAME));
+ .withCreateContainerCmdModifier(cmd -> cmd
+ .withName(S3MOCK_CONTAINER_NAME + "-" +
UUID.randomUUID().toString().substring(0, 8)));
if (!cleanStart) {
Path s3MockDataDir = Path.of("target", "s3mock");
boolean existingData = s3MockDataDir.toFile().exists();
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
index 4a0b451..b47b59c 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
@@ -145,8 +145,8 @@
final TestExecutor testExecutor = new TestExecutor();
LOGGER.info("Starting S3 mock and Nessie containers");
s3Mock = LocalCloudUtilAdobeMock.startS3CloudEnvironment(true);
- nessie = new
GenericContainer<>(NESSIE_IMAGE).withExposedPorts(NESSIE_PORT)
- .withCreateContainerCmdModifier(cmd ->
cmd.withName(NESSIE_CONTAINER_NAME));
+ nessie = new
GenericContainer<>(NESSIE_IMAGE).withExposedPorts(NESSIE_PORT).withCreateContainerCmdModifier(
+ cmd -> cmd.withName(NESSIE_CONTAINER_NAME + "-" +
UUID.randomUUID().toString().substring(0, 8)));
nessie.setPortBindings(List.of(NESSIE_PORT + ":" + NESSIE_PORT));
nessie.start();
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21228?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: I10ea8fe99f81ffacdcd302fe7cad47f139b920f1
Gerrit-Change-Number: 21228
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>