dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor naming to resolve redis compose in black-box tests

Browse Source
This commit is contained in:
Andrii Landiak 2023-06-05 17:15:32 +03:00
parent 90bf0a0ace
commit 4065c94131
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
View File

@ -111,8 +111,8 @@ public class ContainerTestSuite {
new File(targetDir + (IS_HYBRID_MODE ? "docker-compose.hybrid-test-extras.yml" : "docker-compose.postgres-test-extras.yml")), new File(targetDir + (IS_HYBRID_MODE ? "docker-compose.hybrid-test-extras.yml" : "docker-compose.postgres-test-extras.yml")),
new File(targetDir + "docker-compose.postgres.volumes.yml"), new File(targetDir + "docker-compose.postgres.volumes.yml"),
new File(targetDir + "docker-compose." + QUEUE_TYPE + ".yml"), new File(targetDir + "docker-compose." + QUEUE_TYPE + ".yml"),
new File(targetDir + resolveComposeFile()), new File(targetDir + resolveRedisComposeFile()),
new File(targetDir + resolveComposeVolumesFile()), new File(targetDir + resolveRedisComposeVolumesFile()),
new File(targetDir + ("docker-selenium.yml")) new File(targetDir + ("docker-selenium.yml"))
)); ));
@ -179,7 +179,7 @@ public class ContainerTestSuite {
} }
} }
private static String resolveComposeFile() { private static String resolveRedisComposeFile() {
if (IS_REDIS_CLUSTER) { if (IS_REDIS_CLUSTER) {
return "docker-compose.redis-cluster.yml"; return "docker-compose.redis-cluster.yml";
} }
@ -189,7 +189,7 @@ public class ContainerTestSuite {
return "docker-compose.redis.yml"; return "docker-compose.redis.yml";
} }
private static String resolveComposeVolumesFile() { private static String resolveRedisComposeVolumesFile() {
if (IS_REDIS_CLUSTER) { if (IS_REDIS_CLUSTER) {
return "docker-compose.redis-cluster.volumes.yml"; return "docker-compose.redis-cluster.volumes.yml";
} }

12
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
View File

@ -77,8 +77,8 @@ public class ThingsBoardDbInstaller {
? new File("./../../docker/docker-compose.hybrid.yml") ? new File("./../../docker/docker-compose.hybrid.yml")
: new File("./../../docker/docker-compose.postgres.yml"), : new File("./../../docker/docker-compose.postgres.yml"),
new File("./../../docker/docker-compose.postgres.volumes.yml"), new File("./../../docker/docker-compose.postgres.volumes.yml"),
resolveComposeFile(), resolveRedisComposeFile(),
resolveComposeVolumesFile() resolveRedisComposeVolumesFile()
)); ));
if (IS_HYBRID_MODE) { if (IS_HYBRID_MODE) {
composeFiles.add(new File("./../../docker/docker-compose.cassandra.volumes.yml")); composeFiles.add(new File("./../../docker/docker-compose.cassandra.volumes.yml"));
@ -132,7 +132,7 @@ public class ThingsBoardDbInstaller {
dockerCompose.withEnv(env); dockerCompose.withEnv(env);
} }
private static File resolveComposeVolumesFile() { private static File resolveRedisComposeVolumesFile() {
if (IS_REDIS_CLUSTER) { if (IS_REDIS_CLUSTER) {
return new File("./../../docker/docker-compose.redis-cluster.volumes.yml"); return new File("./../../docker/docker-compose.redis-cluster.volumes.yml");
} }
@ -142,7 +142,7 @@ public class ThingsBoardDbInstaller {
return new File("./../../docker/docker-compose.redis.volumes.yml"); return new File("./../../docker/docker-compose.redis.volumes.yml");
} }
private static File resolveComposeFile() { private static File resolveRedisComposeFile() {
if (IS_REDIS_CLUSTER) { if (IS_REDIS_CLUSTER) {
return new File("./../../docker/docker-compose.redis-cluster.yml"); return new File("./../../docker/docker-compose.redis-cluster.yml");
} }
@ -241,11 +241,11 @@ public class ThingsBoardDbInstaller {
dockerCompose.withCommand("volume rm -f " + postgresDataVolume + " " + tbLogVolume + dockerCompose.withCommand("volume rm -f " + postgresDataVolume + " " + tbLogVolume +
" " + tbCoapTransportLogVolume + " " + tbLwm2mTransportLogVolume + " " + tbHttpTransportLogVolume + " " + tbCoapTransportLogVolume + " " + tbLwm2mTransportLogVolume + " " + tbHttpTransportLogVolume +
" " + tbMqttTransportLogVolume + " " + tbSnmpTransportLogVolume + " " + tbVcExecutorLogVolume + resolveComposeVolumeLog()); " " + tbMqttTransportLogVolume + " " + tbSnmpTransportLogVolume + " " + tbVcExecutorLogVolume + resolveRedisComposeVolumeLog());
dockerCompose.invokeDocker(); dockerCompose.invokeDocker();
} }
private String resolveComposeVolumeLog() { private String resolveRedisComposeVolumeLog() {
if (IS_REDIS_CLUSTER) { if (IS_REDIS_CLUSTER) {
return IntStream.range(0, 6).mapToObj(i -> " " + redisClusterDataVolume + "-" + i).collect(Collectors.joining()); return IntStream.range(0, 6).mapToObj(i -> " " + redisClusterDataVolume + "-" + i).collect(Collectors.joining());
} }