commit 52cf9b82138bd75912274723d315bb81d34ee446
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Apr 07 08:20:52 2021 +0000
committer Gerrit Code Review <gerrit@cffb16fd602b> Wed Apr 07 08:20:52 2021 +0000
tree 22cd36d59f6450e1331742d42118b32a24d66072
parent 5fccb577093f5f922e2466cfce42749a15f89d61
parent 2dd5bfdc3d00e0c29eec24e9ced1b200bde543b9

Merge "Enforce linux repo update before calling package update" into release/proposed/2019.2.0

upgrade-mcp-release.groovy

diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7aa98cb..c067861 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -895,12 +895,11 @@
             }
 
             stage('Update Drivetrain') {
+                salt.enforceState(venvPepper, 'I@linux:system', 'linux.system.repo', true, true, batchSize, false, 60, 2)
                 salt.enforceState(venvPepper, '*', 'linux.system.package', true, true, batchSize, false, 60, 2)
 
                 if (upgradeSaltStack) {
                     updateSaltStack('I@salt:master', '["salt-master", "salt-common", "salt-api", "salt-minion"]')
-
-                    salt.enforceState(venvPepper, 'I@linux:system', 'linux.system.repo', true, true, batchSize, false, 60, 2)
                     updateSaltStack('I@salt:minion and not I@salt:master', '["salt-minion"]')
                 }