commit 7c836bab4ae63ad187321b5f20d13df574f74e67
author Tomek Jaroszyk <tjaroszyk@mirantis.com> Mon Sep 07 15:02:03 2020 +0200
committer tjaroszyk <tjaroszyk@mirantis.com> Mon Sep 07 13:06:09 2020 +0000
tree 7f017b547c53db2ef7492d90c4e8671469b842b3
parent cf5fabe7a7286dda95f640ddcd531c96edb96f1d

Removed condition for short path in order to allow re-run the pipeline

Related-Prod: PROD-35173
Change-Id: Ib5a8af54fb5223e798cc50e8891a620718b465e1

ceph-remove-osd.groovy

diff --git a/ceph-remove-osd.groovy b/ceph-remove-osd.groovy
index 0a9d4cc..b39434b 100644
--- a/ceph-remove-osd.groovy
+++ b/ceph-remove-osd.groovy
@@ -66,15 +66,11 @@
                 }
             }
 
-            if ( osd_ids == [] )
-            {
-              currentBuild.result = 'SUCCESS'
-              return
-            }
-
             // `ceph osd out <id> <id>`
             stage('Set OSDs out') {
-                salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd out ' + osd_ids.join(' '))
+                if ( !osd_ids.isEmpty() ) {
+                    salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd out ' + osd_ids.join(' '))
+                }
             }
 
             // wait for healthy cluster