Browse Source

Add blackBoxTests.skipTailChildContainers system parameter

pull/1242/head
Igor Kulikov 8 years ago
parent
commit
f9088daccd
  1. 2
      .travis.yml
  2. 3
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java

2
.travis.yml

@ -9,4 +9,4 @@ language: java
sudo: required
services:
- docker
script: mvn clean verify -Ddockerfile.skip=false -DblackBoxTests.skip=false
script: mvn clean verify -Ddockerfile.skip=false -DblackBoxTests.skip=false -DblackBoxTests.skipTailChildContainers=true

3
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java

@ -42,13 +42,14 @@ public class ContainerTestSuite {
@ClassRule
public static DockerComposeContainer getTestContainer() {
if (testContainer == null) {
boolean skipTailChildContainers = Boolean.valueOf(System.getProperty("blackBoxTests.skipTailChildContainers"));
testContainer = new DockerComposeContainer(
new File("./../../docker/docker-compose.yml"),
new File("./../../docker/docker-compose.postgres.yml"),
new File("./../../docker/docker-compose.postgres.volumes.yml"))
.withPull(false)
.withLocalCompose(true)
.withTailChildContainers(true)
.withTailChildContainers(!skipTailChildContainers)
.withEnv(installTb.getEnv())
.withEnv("LOAD_BALANCER_NAME", "")
.withExposedService("haproxy", 80, Wait.forHttp("/swagger-ui.html").withStartupTimeout(Duration.ofSeconds(400)));

Loading…
Cancel
Save