Fix generate-cookiecutter-products.groovy fallback check
Change-Id: I29ce420b7e27f300b3e1c4284b2aad01bfd99b51
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 1b37339..8dfcba4 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -73,10 +73,13 @@
distribRevision = distribRevision.split('/')[-1]
}
// Check if we are going to test bleeding-edge release, which doesn't have binary release yet
- if (!common.checkRemoteBinary([mcp_version: distribRevision]).linux_system_repo_url) {
- common.warningMsg("Binary release: ${distribRevision} not exist. Fallback to 'proposed'! ")
+ // After 2018q4 releases, need to also check 'static' repo, for example ubuntu.
+ binTest = common.checkRemoteBinary(['mcp_version': distribRevision])
+ if (!binTest.linux_system_repo_url || !binTest.linux_system_repo_ubuntu_url) {
+ common.errorMsg("Binary release: ${distribRevision} not exist or not full. Fallback to 'proposed'! ")
distribRevision = 'proposed'
}
+
// (azvyagintsev) WA for PROD-25732
if (context.cookiecutter_template_url.contains('gerrit.mcp.mirantis.com/mk/cookiecutter-templates')) {
common.warningMsg('Apply WA for PROD-25732')
@@ -172,11 +175,6 @@
stage("Test") {
if (runTestModel) {
- // Check if we are going to test bleeding-edge release, which doesn't have binary release yet
- if (!common.checkRemoteBinary([mcp_version: distribRevision]).linux_system_repo_url) {
- common.errorMsg("Binary release: ${distribRevision} not exist. Fallback to 'proposed'! ")
- distribRevision = 'proposed'
- }
sh("cp -r ${modelEnv} ${testEnv}")
def DockerCName = "${env.JOB_NAME.toLowerCase()}_${env.BUILD_TAG.toLowerCase()}"
common.infoMsg("Attempt to run test against distribRevision: ${distribRevision}")