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/06/02 13:02:14 UTC
[incubator-hop] branch integration-tests-v2 updated: HOP-2914: fix
variables
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests-v2
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/integration-tests-v2 by this push:
new f85c288 HOP-2914: fix variables
f85c288 is described below
commit f85c288ba1ac342c25290105a33ee11964aaa19b
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Jun 2 14:58:23 2021 +0200
HOP-2914: fix variables
---
docker/integration-tests/integration-tests-cassandra.yaml | 6 ------
docker/integration-tests/integration-tests-database.yaml | 6 ------
docker/integration-tests/integration-tests-mongo.yaml | 6 ------
docker/integration-tests/integration-tests-neo4j.yaml | 6 ------
integration-tests/scripts/run-tests-docker.sh | 8 ++++----
5 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/docker/integration-tests/integration-tests-cassandra.yaml b/docker/integration-tests/integration-tests-cassandra.yaml
index d96ef33..6f2b5c1 100644
--- a/docker/integration-tests/integration-tests-cassandra.yaml
+++ b/docker/integration-tests/integration-tests-cassandra.yaml
@@ -21,12 +21,6 @@ services:
extends:
file: integration-tests-base.yaml
service: integration_test
- build:
- args:
- - JENKINS_USER=jenkins
- - JENKINS_UID=1000
- - JENKINS_GROUP=jenkins
- - JENKINS_GID=1000
depends_on:
cassandra:
condition: service_healthy
diff --git a/docker/integration-tests/integration-tests-database.yaml b/docker/integration-tests/integration-tests-database.yaml
index eb24a2f..7e551a7 100644
--- a/docker/integration-tests/integration-tests-database.yaml
+++ b/docker/integration-tests/integration-tests-database.yaml
@@ -21,12 +21,6 @@ services:
extends:
file: integration-tests-base.yaml
service: integration_test
- build:
- args:
- - JENKINS_USER=jenkins
- - JENKINS_UID=1000
- - JENKINS_GROUP=jenkins
- - JENKINS_GID=1000
depends_on:
postgres:
condition: service_healthy
diff --git a/docker/integration-tests/integration-tests-mongo.yaml b/docker/integration-tests/integration-tests-mongo.yaml
index 523e0f0..16ee0da 100644
--- a/docker/integration-tests/integration-tests-mongo.yaml
+++ b/docker/integration-tests/integration-tests-mongo.yaml
@@ -21,12 +21,6 @@ services:
extends:
file: integration-tests-base.yaml
service: integration_test
- build:
- args:
- - JENKINS_USER=jenkins
- - JENKINS_UID=1000
- - JENKINS_GROUP=jenkins
- - JENKINS_GID=1000
depends_on:
mongo:
condition: service_healthy
diff --git a/docker/integration-tests/integration-tests-neo4j.yaml b/docker/integration-tests/integration-tests-neo4j.yaml
index 6673ca1..6926281 100644
--- a/docker/integration-tests/integration-tests-neo4j.yaml
+++ b/docker/integration-tests/integration-tests-neo4j.yaml
@@ -21,12 +21,6 @@ services:
extends:
file: integration-tests-base.yaml
service: integration_test
- build:
- args:
- - JENKINS_USER=jenkins
- - JENKINS_UID=1000
- - JENKINS_GROUP=jenkins
- - JENKINS_GID=1000
depends_on:
neo4j:
condition: service_healthy
diff --git a/integration-tests/scripts/run-tests-docker.sh b/integration-tests/scripts/run-tests-docker.sh
index ee9871a..0353790 100755
--- a/integration-tests/scripts/run-tests-docker.sh
+++ b/integration-tests/scripts/run-tests-docker.sh
@@ -29,10 +29,10 @@ do
case "$KEY" in
PROJECT_NAME) PROJECT_NAME=${VALUE} ;;
- JENKINS_USER) REPOSITORY_NAME=${VALUE} ;;
- JENKINS_UID) REPOSITORY_NAME=${VALUE} ;;
- JENKINS_GROUP) REPOSITORY_NAME=${VALUE} ;;
- JENKINS_GID) REPOSITORY_NAME=${VALUE} ;;
+ JENKINS_USER) JENKINS_USER=${VALUE} ;;
+ JENKINS_UID) JENKINS_UID=${VALUE} ;;
+ JENKINS_GROUP) JENKINS_GROUP=${VALUE} ;;
+ JENKINS_GID) JENKINS_GID=${VALUE} ;;
*)
esac