commit 432440488820d1fa97aa3761b6562c28ade208e3
author Jakub Josef <jakub.josef@gmail.com> Mon May 29 15:54:34 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Mon May 29 15:54:35 2017 +0000
tree 0afd46661d5adb6a7e33f5cbd9f04cabf6bb1684
parent 48982af4c7e6e9127023b0def74c9aecbdd1d3f3
parent 96ec3aae5757eb1a211d4bcffc5e8f9c8e8d31a6

Merge "Fixed backward compatibility lab pipeline code"

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index ff72b5d..1158a74 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -53,16 +53,7 @@
 salt = new com.mirantis.mk.Salt()
 test = new com.mirantis.mk.Test()
 
-// try to get STACK_INSTALL or fallback to INSTALL if exists
-try {
-  def temporary = STACK_INSTALL
-} catch (MissingPropertyException e) {
-  try {
-    STACK_INSTALL = INSTALL
-  } catch (MissingPropertyException e2) {
-    common.errorMsg("Property STACK_INSTALL or INSTALL not found!")
-  }
-}
+
 
 
 _MAX_PERMITTED_STACKS = 2
@@ -70,6 +61,17 @@
 
 timestamps {
     node {
+        // try to get STACK_INSTALL or fallback to INSTALL if exists
+        try {
+          def temporary = STACK_INSTALL
+        } catch (MissingPropertyException e) {
+          try {
+            STACK_INSTALL = INSTALL
+            env['STACK_INSTALL'] = INSTALL
+          } catch (MissingPropertyException e2) {
+            common.errorMsg("Property STACK_INSTALL or INSTALL not found!")
+          }
+        }
         try {
             //
             // Prepare machines