Merge "unset flags even if pipeline failed with a exception" into release/proposed/2019.2.0
diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index ab5706c..7585a01 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -27,11 +27,9 @@
def python = new com.mirantis.mk.Python()
ceph = new com.mirantis.mk.Ceph()
-def pepperEnv = "pepperEnv"
+pepperEnv = "pepperEnv"
flags = CLUSTER_FLAGS.tokenize(',')
-def runHighState = RUNHIGHSTATE
-
def backup(master, target) {
stage("backup ${target}") {
@@ -124,9 +122,6 @@
}
ceph.waitForHealthy(master, ADMIN_HOST, flags)
- if(runHighState) {
- salt.enforceHighstate(pepperEnv, tgt)
- }
}
stage("Verify services for ${minion}") {
@@ -246,6 +241,11 @@
if (TARGET_RELEASE == 'nautilus' ) {
salt.cmdRun(pepperEnv, ADMIN_HOST, "ceph mon enable-msgr2")
}
+ if(RUNHIGHSTATE.toBoolean()) {
+ salt.enforceHighstate(pepperEnv, "I@ceph:mon or I@ceph:mgr", '', false, true, 1)
+ salt.enforceHighstate(pepperEnv, "I@ceph:radosgw", '', false, true, 1)
+ salt.enforceHighstate(pepperEnv, "I@ceph:osd", '', false, true, 1)
+ }
}
}
diff --git a/cvp-tempest.groovy b/cvp-tempest.groovy
index c4351b9..289d816 100644
--- a/cvp-tempest.groovy
+++ b/cvp-tempest.groovy
@@ -129,7 +129,7 @@
SKIP_LIST_PATH = (env.SKIP_LIST_PATH) ?: salt.getPillar(saltMaster, SERVICE_NODE, '_param:tempest_skip_list_path')['return'][0].values()[0]
if (SKIP_LIST_PATH) {
mounts = ["${runtest_tempest_cfg_dir}/skip.list": "/var/lib/tempest/skiplists/skip.list"]
- salt.cmdRun(saltMaster, SERVICE_NODE, "salt-cp ${TARGET_NODE} ${SKIP_LIST_PATH} ${runtest_tempest_cfg_dir}/skip.list")
+ salt.cmdRun(saltMaster, SERVICE_NODE, "salt-cp '${TARGET_NODE}' ${SKIP_LIST_PATH} ${runtest_tempest_cfg_dir}/skip.list")
}
}
else {