Merge "Use cloud-user name if specified for generation config-drive"
diff --git a/test-salt-model-wrapper.groovy b/test-salt-model-wrapper.groovy
index b8fb9e8..118431a 100644
--- a/test-salt-model-wrapper.groovy
+++ b/test-salt-model-wrapper.groovy
@@ -213,11 +213,15 @@
                 if (gerritProject == cookiecutterTemplatesRepo) {
                     branchJobName = 'test-drivetrain'
                     branches[branchJobName] = runTests(branchJobName, yamlJobParameters(buildTestParams))
-                }
-                if (gerritProject in [cookiecutterTemplatesRepo, reclassSystemRepo]) {
                     branchJobName = 'oscore-test-cookiecutter-models'
                     branches[branchJobName] = runTests(branchJobName, yamlJobParameters(buildTestParams))
                 }
+                if (env['GERRIT_EVENT_COMMENT_TEXT'] && new String(env['GERRIT_EVENT_COMMENT_TEXT'].decodeBase64()) =~ /\ntest_schemas.*/) {
+                    if (gerritProject == reclassSystemRepo) {
+                       branchJobName = 'oscore-test-cookiecutter-models'
+                       branches[branchJobName] = runTests(branchJobName, yamlJobParameters(buildTestParams))
+                    }
+                }
             }
             branches.keySet().each { key ->
                 if (branches[key] instanceof Closure) {
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 77c0a26..de24a41 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -170,7 +170,7 @@
                 if (updateClusterModel) {
                     common.infoMsg('Perform: UPDATE_CLUSTER_MODEL')
                     def dateTime = common.getDatetime()
-                    salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/ && git submodule update")
+                    salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/ && git submodule foreach git fetch")
                     salt.cmdRun(venvPepper, 'I@salt:master', "cd /srv/salt/reclass/classes/cluster/$cluster_name && " +
                         "grep -r --exclude-dir=aptly -l 'mcp_version: .*' * | xargs --no-run-if-empty sed -i 's|mcp_version: .*|mcp_version: \"$targetMcpVersion\"|g'")
                     // Do the same, for deprecated variable-duplicate