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 2020/12/27 15:50:59 UTC
[incubator-hop] branch HOP-2318 updated: HOP-2318: add Jenkins
user/group for permissions
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch HOP-2318
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/HOP-2318 by this push:
new 3489e57 HOP-2318: add Jenkins user/group for permissions
3489e57 is described below
commit 3489e574381df3a7b15ee4539e284777c35a2aff
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 27 16:50:42 2020 +0100
HOP-2318: add Jenkins user/group for permissions
---
Jenkinsfile.daily | 1 +
docker/integration-tests/docker-compose-ci.yaml | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 12c3815..80e01d6 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -97,6 +97,7 @@ pipeline {
// }
stage('Create Docker image & Run Tests'){
steps {
+ sh "docker-compose build -f 'docker/integration-tests/docker-compose-ci.yaml' --build-arg JENKINS_USER=${jenkins_user} --build-arg JENKINS_UID=${jenkins_uid} --build-arg JENKINS_GROUP=${jenkins_group} --build-arg JENKINS_GID=${jenkins_gid}"
sh "docker-compose -f 'docker/integration-tests/docker-compose-ci.yaml' up -d"
sh "docker wait integration-tests_integration_test_1"
sh "docker logs integration-tests_integration_test_1"
diff --git a/docker/integration-tests/docker-compose-ci.yaml b/docker/integration-tests/docker-compose-ci.yaml
index 426d5a8..d852dad 100644
--- a/docker/integration-tests/docker-compose-ci.yaml
+++ b/docker/integration-tests/docker-compose-ci.yaml
@@ -21,6 +21,11 @@ services:
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:
@@ -29,9 +34,7 @@ services:
- postgres
environment:
- FLASK_ENV=docker
- #command: ["bash", "-c", "ls -al /files/scripts/"]
command: ["bash", "-c", "/files/scripts/run-tests.sh"]
- #command: ["bash", "-c", "PGPASSWORD=hop_password psql --host=postgres --username=hop_user --dbname=hop_database"]
postgres:
image: postgres:latest
env_file: