Merge "Add verification of Calico cluster state after upgrade"
diff --git a/k8s-upgrade-pipeline.groovy b/k8s-upgrade-pipeline.groovy
index 5dcf870..1c168f3 100644
--- a/k8s-upgrade-pipeline.groovy
+++ b/k8s-upgrade-pipeline.groovy
@@ -139,11 +139,15 @@
}
}
-def performCalicoConfigurationUpdateAndServicesRestart(pepperEnv, target) {
+def performCalicoConfigurationUpdateAndServicesRestart(pepperEnv, target, ctl_node) {
def salt = new com.mirantis.mk.Salt()
stage("Performing Calico configuration update and services restart") {
- salt.enforceState(pepperEnv, target, "kubernetes.pool.calico")
+ if (containerDenabled(pepperEnv, ctl_node)) {
+ salt.enforceState(pepperEnv, target, "kubernetes.pool")
+ } else {
+ salt.enforceState(pepperEnv, target, "kubernetes.pool.calico")
+ }
salt.runSaltProcessStep(pepperEnv, target, 'service.restart', ['kubelet'])
}
}
@@ -621,7 +625,7 @@
// this sequence implies workloads operations downtime
startCalicoUpgrade(pepperEnv, ctl_node)
- performCalicoConfigurationUpdateAndServicesRestart(pepperEnv, POOL)
+ performCalicoConfigurationUpdateAndServicesRestart(pepperEnv, POOL, ctl_node)
completeCalicoUpgrade(pepperEnv, ctl_node)
// no downtime is expected after this point
}
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 79a1632..27313c7 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -27,7 +27,7 @@
extraVars = [:]
}
-slaveNode = env.SLAVE_NODE ?: 'docker'
+slaveNode = env.SLAVE_NODE ?: 'virtual'
checkIncludeOrder = env.CHECK_INCLUDE_ORDER ?: false
// Global var's
diff --git a/test-salt-model-wrapper.groovy b/test-salt-model-wrapper.groovy
index 9f61db8..f49b7fc 100644
--- a/test-salt-model-wrapper.groovy
+++ b/test-salt-model-wrapper.groovy
@@ -12,7 +12,7 @@
cookiecutterTemplatesRepo='mk/cookiecutter-templates'
reclassSystemRepo='salt-models/reclass-system'
-slaveNode = env.getProperty('SLAVE_NODE') ?: 'python&&docker'
+slaveNode = env.getProperty('SLAVE_NODE') ?: 'virtual'
voteMatrix = [
'test-mk-cookiecutter-templates': true,