commit 8e79586c85b8158c7a133c67672bc7fcf1470e48
author chnyda <chnyda@mirantis.com> Mon Apr 24 13:54:12 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Mon Apr 24 13:54:14 2017 +0000
tree 2ea25a8dec563c0bb8dcdf4b34af69d96a9416a0
parent bcf19e0253ad954b708bc58414b4f2097437f255
parent 311251ebf655a10fdcb1e83812eb8f7fa8c9274a

Merge "fix archive artifacts"

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index edfabbc..3e44bfa 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -501,14 +501,43 @@
             //
             // Test
             //
+            def artifacts_dir = '_artifacts/'
 
             if (common.checkContains('TEST', 'k8s')) {
                 stage('Run k8s bootstrap tests') {
-                    orchestrate.runConformanceTests(saltMaster, K8S_API_SERVER, 'tomkukral/k8s-scripts')
+                    def image = 'tomkukral/k8s-scripts'
+                    def output_file = image.replaceAll('/', '-') + '.output'
+
+                    // run image
+                    test.runConformanceTests(saltMaster, K8S_API_SERVER, image)
+
+                    // collect output
+                    sh "mkdir -p ${artifacts_dir}"
+                    file_content = salt.getFileContent(saltMaster, 'ctl01*', '/tmp/' + output_file)
+                    writeFile file: "${artifacts_dir}${output_file}", text: file_content
+                    sh "cat ${artifacts_dir}${output_file}"
+
+                    // collect artifacts
+                    archiveArtifacts artifacts: "${artifacts_dir}${output_file}"
                 }
 
                 stage('Run k8s conformance e2e tests') {
-                    orchestrate.runConformanceTests(saltMaster, K8S_API_SERVER, K8S_CONFORMANCE_IMAGE)
+                    //test.runConformanceTests(saltMaster, K8S_API_SERVER, K8S_CONFORMANCE_IMAGE)
+
+                    def image = K8S_CONFORMANCE_IMAGE
+                    def output_file = image.replaceAll('/', '-') + '.output'
+
+                    // run image
+                    test.runConformanceTests(saltMaster, K8S_API_SERVER, image)
+
+                    // collect output
+                    sh "mkdir -p ${artifacts_dir}"
+                    file_content = salt.getFileContent(saltMaster, 'ctl01*', '/tmp/' + output_file)
+                    writeFile file: "${artifacts_dir}${output_file}", text: file_content
+                    sh "cat ${artifacts_dir}${output_file}"
+
+                    // collect artifacts
+                    archiveArtifacts artifacts: "${artifacts_dir}${output_file}"
                 }
             }
 
@@ -523,10 +552,12 @@
             }
 
             stage('Finalize') {
-                try {
-                    salt.runSaltProcessStep(saltMaster, '*', 'state.apply', [], null, true)
-                } catch (Exception e) {
-                    common.warningMsg('State apply failed but we should continue to run')
+                if (INSTALL != '') {
+                    try {
+                        salt.runSaltProcessStep(saltMaster, '*', 'state.apply', [], null, true)
+                    } catch (Exception e) {
+                        common.warningMsg('State apply failed but we should continue to run')
+                    }
                 }
             }
         } catch (Throwable e) {