You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/03/26 08:49:40 UTC
[incubator-hop] branch master updated: HOP-2668 : Docker:
Integration tests - need healthchecks for dependencies
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new b5d0612 HOP-2668 : Docker: Integration tests - need healthchecks for dependencies
new 086cba0 Merge pull request #706 from mattcasters/master
b5d0612 is described below
commit b5d06122f9de4c90c3c4a6c6026a5947993b0f82
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Fri Mar 26 09:47:46 2021 +0100
HOP-2668 : Docker: Integration tests - need healthchecks for dependencies
---
docker/integration-tests/docker-compose-ci.yaml | 122 ++++++++++++------------
1 file changed, 61 insertions(+), 61 deletions(-)
diff --git a/docker/integration-tests/docker-compose-ci.yaml b/docker/integration-tests/docker-compose-ci.yaml
index 2476fd1..4719bc6 100644
--- a/docker/integration-tests/docker-compose-ci.yaml
+++ b/docker/integration-tests/docker-compose-ci.yaml
@@ -17,64 +17,64 @@
version: '3'
services:
- integration_test:
- build:
- context: ../../.
- dockerfile: docker/integration-tests/Dockerfile.unit-tests
- args:
- - JENKINS_USER=jenkins
- - JENKINS_UID=1000
- - JENKINS_GROUP=jenkins
- - JENKINS_GID=1000
- volumes:
- - ../../integration-tests/:/files
- depends_on:
- - postgres
- - neo4j
- - mongo
- - cassandra
- links:
- - postgres
- - neo4j
- - mongo
- - cassandra
- environment:
- - FLASK_ENV=docker
- command: ["bash", "-c", "/files/scripts/run-tests.sh"]
- postgres:
- image: postgres:latest
- env_file:
- - database.env
- ports:
- - "5432"
- healthcheck:
- test: [ "CMD-SHELL", "pg_isready -U postgres" ]
- interval: 10s
- timeout: 5s
- retries: 5
- neo4j:
- image: neo4j:latest
- ports:
- - "7474"
- - "7687"
- environment:
- - NEO4J_AUTH=neo4j/abcd
- mongo:
- image: mongo:latest
- ports:
- - "27017"
- healthcheck:
- test: echo 'db.runCommand("ping").ok' | mongo 127.0.0.1:27017/test --quiet
- interval: 10s
- timeout: 10s
- retries: 5
- cassandra:
- image: cassandra:latest
- ports:
- - "9042"
- - "9160"
- healthcheck:
- test: ["CMD-SHELL", "[ $$(nodetool statusgossip) = running ]"]
- interval: 10s
- timeout: 5s
- retries: 50
\ No newline at end of file
+ integration_test:
+ build:
+ context: ../../.
+ dockerfile: docker/integration-tests/Dockerfile.unit-tests
+ args:
+ - JENKINS_USER=jenkins
+ - JENKINS_UID=1000
+ - JENKINS_GROUP=jenkins
+ - JENKINS_GID=1000
+ volumes:
+ - ../../integration-tests/:/files
+ depends_on:
+ - postgres
+ - neo4j
+ - mongo
+ - cassandra
+ links:
+ - postgres
+ - neo4j
+ - mongo
+ - cassandra
+ environment:
+ - FLASK_ENV=docker
+ command: [ "bash", "-c", "/files/scripts/run-tests.sh" ]
+ postgres:
+ image: postgres:latest
+ env_file:
+ - database.env
+ ports:
+ - "5432"
+ healthcheck:
+ test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+ neo4j:
+ image: neo4j:latest
+ ports:
+ - "7474"
+ - "7687"
+ environment:
+ - NEO4J_AUTH=neo4j/abcd
+ mongo:
+ image: mongo:latest
+ ports:
+ - "27017"
+ healthcheck:
+ test: echo 'db.runCommand("ping").ok' | mongo 127.0.0.1:27017/test --quiet
+ interval: 10s
+ timeout: 10s
+ retries: 5
+ cassandra:
+ image: cassandra:latest
+ ports:
+ - "9042"
+ - "9160"
+ healthcheck:
+ test: [ "CMD-SHELL", "[ $$(nodetool statusgossip) = running ]" ]
+ interval: 10s
+ timeout: 5s
+ retries: 50
\ No newline at end of file