Add force option for vcp promote
* And use it by default, in release-mcp-version
Change-Id: I3e35f824610509a3d4fb0a5eeacd77a2dae3af75
Related-Bug: PROD-23604 (PROD:23604)
diff --git a/promote-vcp-images.groovy b/promote-vcp-images.groovy
index 181eafa..7b4f80e 100644
--- a/promote-vcp-images.groovy
+++ b/promote-vcp-images.groovy
@@ -17,6 +17,8 @@
slaveNode = env.SLAVE_NODE ?: 'jsl23.mcp.mirantis.net'
def job_env = env.getEnvironment().findAll { k, v -> v }
def verify = job_env.VERIFY_DOWNLOAD ?: true
+def overwrite = job_env.FORCE_OVERWRITE.toBoolean() ?: false
+
timeout(time: 6, unit: 'HOURS') {
@@ -91,7 +93,7 @@
remoteImageStatus = ''
remoteImageStatus = sh(script: "wget --auth-no-challenge --spider ${targetImageUrl} 2>/dev/null", returnStatus: true)
// wget return code 8 ,if file not exist
- if (remoteImageStatus != '8') {
+ if (remoteImageStatus != 8 && !overwrite) {
error("Attempt to overwrite existing release! Target: ${targetImage} already exist!")
}
}
diff --git a/release-mcp-version.groovy b/release-mcp-version.groovy
index 4cae93c..f51696d 100644
--- a/release-mcp-version.groovy
+++ b/release-mcp-version.groovy
@@ -78,7 +78,8 @@
build job: "promote-vcp-images-all", parameters: [
[$class: 'StringParameterValue', name: 'VCP_IMAGE_LIST', value: VcpImageList],
[$class: 'StringParameterValue', name: 'TAG', value: tag],
- [$class: 'StringParameterValue', name: 'SOURCE_TAG', value: sourceTag]
+ [$class: 'StringParameterValue', name: 'SOURCE_TAG', value: sourceTag],
+ [$class: 'BooleanParameterValue', name: 'FORCE_OVERWRITE', value: true],
]
}