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 918caa726820685b94d02d2f2129500b1a6391c5 Author: Hans Van Akelyen <[email protected]> AuthorDate: Sun Dec 6 10:13:17 2020 +0100 HOP-2122 --- Jenkinsfile.daily | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily index d6bf3dc..3e7cea3 100644 --- a/Jenkinsfile.daily +++ b/Jenkinsfile.daily @@ -102,34 +102,34 @@ pipeline { // } // } // } - // stage('Create Docker image & Run Tests'){ - // when { - // branch 'integration-tests' - // } - // steps { - // script { - // 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 'ls /files' - // sh 'cd /files/scripts && ./run-tests.sh' - // } - // } - // } - // post { - // always { - // junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true) - // } - // } - // } - // stage('Remove docker image'){ - // when { - // branch 'integration-tests' - // } - // steps { - // sh "docker rmi $imagename:latest" - // } - // } + stage('Create Docker image & Run Tests'){ + when { + branch 'integration-tests' + } + steps { + script { + 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 'ls /files' + sh 'cd /files/scripts && ./run-tests.sh' + } + } + } + post { + always { + junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true) + } + } + } + stage('Remove docker image'){ + when { + branch 'integration-tests' + } + steps { + sh "docker rmi $imagename:latest" + } + } }
