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
The following commit(s) were added to refs/heads/integration-tests by this push:
new 0e01c82 HOP-2122
0e01c82 is described below
commit 0e01c82f6c6d2e94fb639a23b63e6463c41a8176
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Sun Dec 6 10:01:19 2020 +0100
HOP-2122
---
Dockerfile.unit-tests | 8 +++----
Jenkinsfile.daily | 58 ++++++++++++++++++++++++++-------------------------
2 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 72be821..8d9235e 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -9,10 +9,10 @@ ENV DEPLOYMENT_PATH=/opt
# volume mount point
ENV VOLUME_MOUNT_POINT=/files
#Jenkins user an group
-ENV JENKINS_USER=hop
-ENV JENKINS_GROUP=hop
-ENV JENKINS_UID=1000
-ENV JENKINS_GID=1000
+ARG JENKINS_USER=hop
+ARG JENKINS_GROUP=hop
+ARG JENKINS_UID=1000
+ARG JENKINS_GID=1000
# any JRE settings you want to pass on
# The “-XX:+AggressiveHeap” tells the container to use all memory assigned to
the container.
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 0cadf16..a844508 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -42,6 +42,7 @@ pipeline {
MAVEN_SKIP_RC = true
dockerImage = ''
imagename = 'hop'
+ jenkins_user = $(JENKINS_USER)
}
options {
@@ -60,6 +61,7 @@ pipeline {
steps {
echo 'Building Branch: ' + env.BRANCH_NAME
echo 'Using PATH = ' + env.PATH
+ echo 'Using Jenkins user = ' + jenkins_user
}
}
stage('Cleanup') {
@@ -94,34 +96,34 @@ pipeline {
// }
// }
// }
- stage('Create Docker image & Run Tests'){
- when {
- branch 'integration-tests'
- }
- steps {
- script {
- dockerImage = docker.build(imagename, "-f
Dockerfile.unit-tests --build-arg JENKINS_USER=$(JENKINS_USER) --build-arg
JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP)
--build-arg JENKINS_GID=$(JENKINS_GID) .")
- 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"
+ // }
+ // }
}
