Skip to content
Snippets Groups Projects
Commit c48fff8f authored by Martin Weise's avatar Martin Weise
Browse files

integration test seems not to respect the database reset

Former-commit-id: 534a9422
parent 8f10a269
No related branches found
No related tags found
1 merge request!23Sprint results
......@@ -24,12 +24,12 @@ build-docker:
build-metadata-db:
stage: build
script:
- docker system prune -f --volumes
- "mvn -f fda-metadata-db/pom.xml clean install" # local maven2 repository
test-backend-container:
stage: test
script:
- docker system prune -f --volumes
- "./fda-container-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-container-service/pom.xml clean test verify"
- "./fda-container-service/rest-service/src/test/resources/integration-test.after"
......@@ -41,6 +41,7 @@ test-backend-container:
artifacts:
when: always
paths:
- docker system prune -f --volumes
- fda-container-service/rest-service/target/site/jacoco/jacoco.xml
- fda-container-service/rest-service/target/site/jacoco/index.html
reports:
......@@ -50,6 +51,7 @@ test-backend-container:
test-backend-database:
stage: test
script:
- docker system prune -f --volumes
- "./fda-database-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-database-service/pom.xml clean test verify"
- "./fda-database-service/rest-service/src/test/resources/integration-test.after"
......@@ -70,16 +72,19 @@ test-backend-database:
test-backend-discovery:
stage: test
script:
- docker system prune -f --volumes
- "mvn -f fda-discovery-service/pom.xml clean test verify"
test-backend-gateway:
stage: test
script:
- docker system prune -f --volumes
- "mvn -f fda-gateway-service/pom.xml clean test verify"
test-backend-query:
stage: test
script:
- docker system prune -f --volumes
- "./fda-query-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-query-service/pom.xml clean test verify"
- "./fda-query-service/rest-service/src/test/resources/integration-test.after"
......@@ -100,6 +105,7 @@ test-backend-query:
test-backend-table:
stage: test
script:
- docker system prune -f --volumes
- "./fda-table-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-table-service/pom.xml clean test verify"
- "./fda-table-service/rest-service/src/test/resources/integration-test.after"
......
......@@ -73,7 +73,6 @@ public abstract class BaseIntegrationTest {
public final ContainerImage CONTAINER_1_IMAGE = IMAGE_1;
public final String CONTAINER_1_NAME = "u01";
public final String CONTAINER_1_INTERNAL_NAME = "u01";
public final String CONTAINER_1_DATABASE = "univie";
public final String CONTAINER_1_IP = "172.28.0.3";
public final Instant CONTAINER_1_CREATED = Instant.now().minus(1, HOURS);
......@@ -82,7 +81,6 @@ public abstract class BaseIntegrationTest {
public final ContainerImage CONTAINER_2_IMAGE = IMAGE_2;
public final String CONTAINER_2_NAME = "t01";
public final String CONTAINER_2_INTERNAL_NAME = "u01";
public final String CONTAINER_2_DATABASE = "tuw";
public final String CONTAINER_2_IP = "172.28.0.4";
public final Instant CONTAINER_2_CREATED = Instant.now().minus(1, HOURS);
......
......@@ -53,6 +53,7 @@ public class ContainerServiceIntegrationTest extends BaseIntegrationTest {
@Transactional
@BeforeEach
public void beforeEach() {
afterEach();
/* create network */
dockerClient.createNetworkCmd()
.withName("fda-userdb")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment