commit fb2925ba709d5027759b7fbabc37aac13a76fa5e
author Marek Celoud <mceloud@mirantis.com> Thu Mar 16 17:33:05 2017 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> Thu Mar 16 17:33:06 2017 +0000
tree d256b55d7ca0859d84570eee843be2ce9c1d4d0e
parent 12dd7ba6f54567b60c7d8975647ed22a853d695b
parent c5407c4584286a7ac0206cb2dd42845b90e9b506

Merge "Moved package testing logic outside of stage in update package pipeline"

update-package.groovy

diff --git a/update-package.groovy b/update-package.groovy
index e66bf9d..6c31c95 100644
--- a/update-package.groovy
+++ b/update-package.groovy
@@ -67,13 +67,14 @@
                    input message: "Approve live package upgrades on ${targetLiveSubset} nodes?"
                 }
             }
-            if (TARGET_PACKAGES != "") {
-                command = "pkg.install";
-                packages = TARGET_PACKAGES.tokenize(' ')
-            }else {
-                command = "pkg.upgrade"
-                packages = null
-            }
+        }
+
+        if (TARGET_PACKAGES != "") {
+            command = "pkg.install";
+            packages = TARGET_PACKAGES.tokenize(' ')
+        }else {
+            command = "pkg.upgrade"
+            packages = null
         }
 
         stage('Apply package upgrades on sample') {