[incubator-openwhisk] branch master updated: Adding Lean Openwhisk test to Jenkins (#4480)

[ra...@apache.org]

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

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 541709d  Adding Lean Openwhisk test to Jenkins (#4480)
541709d is described below

commit 541709d9d2f72c01630ade5be6299ea23bed5eaf
Author: Pavel Kravchenko <kp...@il.ibm.com>
AuthorDate: Wed May 15 18:00:59 2019 +0300

    Adding Lean Openwhisk test to Jenkins (#4480)
---
 Jenkinsfile | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6cf8723..d867d7f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,7 +53,7 @@ timeout(time: 12, unit: 'HOURS') {
                         sh "./gradlew distDocker -PdockerRegistry=${domainName}:${port}"
                     }
 
-                    stage('Deploy') {
+                    stage('Deploy Lean') {
                         dir("ansible") {
                             // Copy the jenkins ansible configuration under the directory ansible. This can make sure the SSH is used to
                             // access the VMs of invokers by the VM of the controller.
@@ -76,6 +76,22 @@ timeout(time: 12, unit: 'HOURS') {
                             sh 'ansible-playbook -i environments/jenkins couchdb.yml'
                             sh 'ansible-playbook -i environments/jenkins initdb.yml'
                             sh 'ansible-playbook -i environments/jenkins wipe.yml'
+                            sh 'ansible-playbook -i environments/jenkins openwhisk.yml -e lean=true'
+                        }
+                    }
+
+                    try {
+                        stage('Test Lean Openwhisk') {
+                            sh './gradlew :tests:test --tests system.basic.WskRestBasicTests -DtestResultsDirName=test-lean-openwhisk'
+                        }
+                    } catch (exp) {
+                        println("Exception: " + exp)
+                        error(exp)
+                    }
+
+                    stage('Deploy full Openwhisk') {
+                        dir("ansible") {
+                            sh 'ansible-playbook -i environments/jenkins openwhisk.yml -e mode=clean'
                             sh 'ansible-playbook -i environments/jenkins apigateway.yml'
                             sh 'ansible-playbook -i environments/jenkins openwhisk.yml'
                             sh 'ansible-playbook -i environments/jenkins properties.yml'
@@ -106,6 +122,11 @@ timeout(time: 12, unit: 'HOURS') {
                         println("Exception:" + exp)
                     }
 
+                } catch (exp) {
+                    println("Exception:" + exp)
+		    error(exp)
+                } finally {
+                    println("Executing finally block")
                     stage('Clean up') {
                         dir("ansible") {
                             sh 'ansible-playbook -i environments/jenkins openwhisk.yml -e mode=clean'
@@ -113,10 +134,6 @@ timeout(time: 12, unit: 'HOURS') {
                             sh 'ansible-playbook -i environments/jenkins couchdb.yml -e mode=clean'
                         }
                     }
-
-                } catch (exp) {
-                    println("Exception:" + exp)
-                } finally {
                     step([$class: 'JUnitResultArchiver', testResults: '**/test*/**/TEST-*.xml'])
                 }
             }