Revert "Set distribReviosion to proposed in case of release/proposed/2019.2.0 branch"
This reverts commit 577145040489b2d911d3f039f05abbdf1ad50569.
Change-Id: I55dea71908c27d0b06f836ca826f1dcbc165f014
Related-Prod: PROD-34057
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 17fbdca..d8bfe3a 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -116,7 +116,6 @@
}
if (gitGuessedVersion == 'release/proposed/2019.2.0') {
- distribRevision = 'proposed'
def mcpSaltRepoUpdateVar = 'deb [arch=amd64] http://mirror.mirantis.com/update/proposed/salt-formulas/xenial xenial main'
if (context.get('offline_deployment', 'False').toBoolean()) {
mcpSaltRepoUpdateVar = "deb [arch=amd64] http://${context.get('aptly_server_deploy_address')}/update/proposed/salt-formulas/xenial xenial main".toString()
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 3494c7b..9c34f58 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -221,13 +221,7 @@
}
// 'binary' branch logic w\o 'release/' prefix
if (testDistribRevision.contains('/')) {
- if (testDistribRevision.contains('proposed')) {
- // set distrib revision to proposed to catch all updated from update/proposed
- testDistribRevision = 'proposed'
- messages.add('Enabled update/proposed repo')
- } else {
- testDistribRevision = testDistribRevision.split('/')[-1]
- }
+ testDistribRevision = testDistribRevision.split('/')[-1]
}
// Check if we are going to test bleeding-edge release, which doesn't have binary release yet
// After 2018q4 releases, need to also check 'static' repo, for example ubuntu.