Merge "Set kubernetes_containerd_enabled to True during cluster model upgrade"
diff --git a/test-model-generator.groovy b/test-model-generator.groovy
index ce551d7..1daa9ec 100644
--- a/test-model-generator.groovy
+++ b/test-model-generator.groovy
@@ -189,7 +189,7 @@
}
// Remove everything what is owned by root
testImage.inside(testImageOptions) {
- sh("rm -rf /var/lib/qa_reports/* ${env.WORKSPACE}/${apiProject}/cockroach_data")
+ sh("rm -rf /var/lib/qa_reports/* ${env.WORKSPACE}/${apiProject} ${env.WORKSPACE}/${uiProject}")
}
}
}
diff --git a/test-operations-ui.groovy b/test-operations-ui.groovy
index b6c8b27..f1a8ea2 100644
--- a/test-operations-ui.groovy
+++ b/test-operations-ui.groovy
@@ -22,9 +22,11 @@
node(slaveNode) {
def img = dockerLib.getImage(env.NPM_DOCKER_IMG, "npm:8.12.0")
try {
- if (fileExists("build/")) {
+ if (fileExists('build') || fileExists('.npm')) {
common.infoMsg('Cleaning test env')
- sh("rm -rf build/")
+ img.inside("-u root:root -v ${env.WORKSPACE}/:/operations-ui/") {
+ sh("rm -rf /operations-ui/build/ /operations-ui/.npm")
+ }
}
stage("checkout") {
if (gerritRef) {
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index a139b74..0fa24ae 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -115,13 +115,15 @@
}
// end bw comp. for 2018.X => 2018.11 release
def gitTargetMcpVersion = env.getProperty('GIT_REFSPEC')
- if (targetMcpVersion in ['testing', 'proposed']) {
+ if (targetMcpVersion in ['nightly', 'testing']) {
gitTargetMcpVersion = 'master'
- common.warningMsg("gitTargetMcpVersion has been changed to:${gitTargetMcpVersion}")
+ } else if (targetMcpVersion == 'proposed') {
+ gitTargetMcpVersion = 'proposed'
} else if (!gitTargetMcpVersion) {
// backward compatibility for 2018.11.0
gitTargetMcpVersion = "release/${targetMcpVersion}"
}
+ common.warningMsg("gitTargetMcpVersion has been changed to:${gitTargetMcpVersion}")
def saltMastURL = ''
def saltMastCreds = ''
def upgradeSaltStack = ''