commit 037a5a05b08c70df723e9eae50194e46f39d9f80
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Apr 07 08:20:54 2021 +0000
committer Gerrit Code Review <gerrit@cffb16fd602b> Wed Apr 07 08:20:54 2021 +0000
tree f0e1d73a7517907c8c1df8c8ae2096ffd32c3711
parent 822c761ff93b42bd55e76c5015502add5cfbf907
parent 07a15eecf1269d8427831023439547155951cef5

Merge "Enforce linux repo update before calling package update"

upgrade-mcp-release.groovy

diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 823c0b6..bb52add 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -874,12 +874,11 @@
             }
 
             stage('Update Drivetrain') {
+                salt.enforceState(venvPepper, "I@linux:system", 'linux.system.repo', true, true, batchSize)
                 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)
                     updateSaltStack("I@salt:minion and not I@salt:master", '["salt-minion"]')
                 }