Merge "Use common waitForHealthy function from pipeline-library" into release/proposed/2019.2.0
diff --git a/cvp-func.groovy b/cvp-func.groovy
index 80160ab..6baf15b 100644
--- a/cvp-func.groovy
+++ b/cvp-func.groovy
@@ -46,7 +46,9 @@
if (!keystone_creds) {
keystone_creds = validate._get_keystone_creds_v2(saltMaster)
}
- validate.runContainer(saltMaster, TARGET_NODE, TEST_IMAGE, 'cvp', keystone_creds)
+ def containerParams = ['master': saltMaster, 'target': TARGET_NODE, 'dockerImageLink': TEST_IMAGE,
+ 'name': 'cvp', 'env_var': keystone_creds, 'output_replacing': [/ (OS_PASSWORD=)(.*?)+ /]]
+ validate.runContainer(containerParams)
validate.configureContainer(saltMaster, TARGET_NODE, PROXY, TOOLS_REPO, TEMPEST_REPO, TEMPEST_ENDPOINT_TYPE)
}
diff --git a/stacklight-upgrade.groovy b/stacklight-upgrade.groovy
index c7a90db..60b8fa5 100644
--- a/stacklight-upgrade.groovy
+++ b/stacklight-upgrade.groovy
@@ -229,5 +229,9 @@
}
}
}
+ stage('Post upgrade steps') {
+ common.infoMsg('Apply workaround for PROD-33878')
+ salt.runSaltProcessStep(pepperEnv, "I@fluentd:agent and I@rabbitmq:server", "service.restart", "td-agent", null, true)
+ }
}
}