Merge "Add a sleep after salt master update" into release/proposed/2019.2.0
diff --git a/ceph-add-osd-upmap.groovy b/ceph-add-osd-upmap.groovy
index 5c90c72..48b975f 100644
--- a/ceph-add-osd-upmap.groovy
+++ b/ceph-add-osd-upmap.groovy
@@ -44,17 +44,16 @@
// create connection to salt master
python.setupPepperVirtualenv(pepperEnv, SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
- stage ("verify client versions")
- {
+ stage ("verification of supported features") {
// I@docker:swarm and I@prometheus:server - mon* nodes
def nodes = salt.getMinions(pepperEnv, "I@ceph:common and not ( I@docker:swarm and I@prometheus:server )")
for ( node in nodes )
{
- def versions = salt.cmdRun(pepperEnv, node, "ceph features --format json", checkResponse=true, batch=null, output=false).values()[0]
- versions = new groovy.json.JsonSlurperClassic().parseText(versions[0][node])
- if ( versions['client']['group']['release'] != 'luminous' )
+ def features = salt.cmdRun(pepperEnv, node, "ceph features --format json", checkResponse=true, batch=null, output=false).values()[0]
+ features = new groovy.json.JsonSlurperClassic().parseText(features[0][node])
+ if ( fetures['client']['group']['release'] != 'luminous' )
{
- throw new Exception("client installed on " + node + " is not luminous. Update all clients to luminous before using this pipeline")
+ throw new Exception("client installed on " + node + " does not support upmap. Update all clients to luminous or newer before using this pipeline")
}
}
}
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index d57f99f..9d3981b 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -873,6 +873,8 @@
}
stage('Update Drivetrain') {
+ salt.enforceState(venvPepper, '*', 'linux.system.package', true, true, batchSize, false, 60, 2)
+
if (upgradeSaltStack) {
updateSaltStack('I@salt:master', '["salt-master", "salt-common", "salt-api", "salt-minion"]')