[incubator-hop] 19/22: HOP-2122

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git

commit adaff4fed7f245684aed887b0c104308b00a5653
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 13:05:37 2020 +0100

    HOP-2122
    
    set HOP_JAVA_HOME in container
---
 Dockerfile.unit-tests | 2 ++
 Jenkinsfile.daily     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 8d9235e..2cb1f1a 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -43,6 +43,8 @@ RUN unzip ${DEPLOYMENT_PATH}/hop.zip -d ${DEPLOYMENT_PATH} \
 VOLUME ["/files"]
 USER ${JENKINS_USER}
 ENV PATH=$PATH:${DEPLOYMENT_PATH}/hop
+#SET HOP_JAVA_HOME
+ENV HOP_JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 WORKDIR /home/${JENKINS_USER}
 # CMD ["/bin/bash"]
 ENTRYPOINT []
\ No newline at end of file
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index afb12d9..3d625ef 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -111,7 +111,6 @@ pipeline {
                     dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=${jenkins_user} --build-arg JENKINS_UID=${jenkins_uid} --build-arg JENKINS_GROUP=${jenkins_group} --build-arg JENKINS_GID=${jenkins_gid} -f Dockerfile.unit-tests .")
                     dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
                         echo 'Run tests'
-                        sh 'export HOP_JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk'
                         sh 'cd /files/scripts && ./run-tests.sh'
                     }
                 }