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 3260226  HOP-2212
3260226 is described below

commit 3260226333a918186b557aee6942d8657d33652c
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Sat Dec 5 23:26:43 2020 +0100

    HOP-2212
---
 Jenkinsfile.daily | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 35fa9a8..fcc5a04 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -87,32 +87,41 @@ pipeline {
         //         }
         //     }
         // }
-        stage('Create Docker image'){
+        stage('Create Docker image & Run Tests'){
             steps {
                 script {
                     dockerImage = docker.build(imagename, "-f 
Dockerfile.unit-tests .")
-                }
-            }
-        }
-        stage('Run Integration Tests'){
-            agent {
-                docker { 
-                    image 'hop:latest' 
-                    args "-v $WORKSPACE/integration-tests:/files"
+                    dockerImage.inside("-v 
$WORKSPACE/integration-tests:/files"){
+                        echo 'Run tests'
+                        echo 'ls /files'
                     }
-            }
-            steps {
-                script {
-                    echo 'Run tests'
-                    echo 'ls /files'
                 }
-            }            
+            }
             post {
                 always {
                     junit(testResults: 
'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
                 }
             }
         }
+        // stage('Run Integration Tests'){
+        //     agent {
+        //         docker { 
+        //             image 'hop:latest' 
+        //             args "-v $WORKSPACE/integration-tests:/files"
+        //             }
+        //     }
+        //     steps {
+        //         script {
+        //             echo 'Run tests'
+        //             echo 'ls /files'
+        //         }
+        //     }            
+        //     post {
+        //         always {
+        //             junit(testResults: 
'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
+        //         }
+        //     }
+        // }
         stage('Remove docker image'){
             steps {
                 sh "docker rmi $imagename:latest"

Reply via email to