commit 47e13a612fd1de98521f01328d1d14506371ddeb
author Denis Egorenko <degorenko@mirantis.com> Thu Sep 05 19:17:30 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Thu Sep 12 19:01:12 2019 +0400
tree 7dd566d02dea23aa79a771d35c6e8b393d95a3ca
parent a401f1618f98b721bf50c43738669d0f5458c587

Update build for offline image

* Update build job
* Update salt setup for offline-image

Related-Prod: PROD-32735
Related-Prod: PROD-32736
Change-Id: Ief81e34d6800533fed04710f84635de3116907bc

mirror-image/scripts/salt.sh

diff --git a/mirror-image/scripts/salt.sh b/mirror-image/scripts/salt.sh
index e7f107b..74e376e 100644
--- a/mirror-image/scripts/salt.sh
+++ b/mirror-image/scripts/salt.sh
@@ -6,12 +6,14 @@
 
 SALT_OPTS="-l debug -t 10 --retcode-passthrough --no-color"
 
-salt-call saltutil.refresh_pillar
-salt-call saltutil.sync_all
+salt-call ${SALT_OPTS} saltutil.clear_cache
+salt-call ${SALT_OPTS} saltutil.refresh_pillar
+salt-call ${SALT_OPTS} saltutil.sync_all
+salt-call ${SALT_OPTS} reclass.validate_pillar
 
+salt-call ${SALT_OPTS} state.sls salt.minion.ca
 salt-call ${SALT_OPTS} state.sls salt
-salt-call ${SALT_OPTS} state.sls linux.system.repo,linux.system.directory,linux.system.package
-salt-call ${SALT_OPTS} state.sls linux.system.file
+salt-call ${SALT_OPTS} state.sls linux.system.repo,linux.system.package,linux.system.directory,linux.system.file,linux.system.config
 salt-call ${SALT_OPTS} state.sls docker.host
 salt-call ${SALT_OPTS} state.sls docker exclude=docker.client.registry
 sleep 120

packer-image-buid.groovy

diff --git a/packer-image-buid.groovy b/packer-image-buid.groovy
index 3b48075..2cc625b 100644
--- a/packer-image-buid.groovy
+++ b/packer-image-buid.groovy
@@ -152,8 +152,10 @@
                             checkout([
                                     $class             : 'GitSCM',
                                     branches           : [[name: 'FETCH_HEAD']],
-                                    recursiveSubmodules: true,
-                                    extensions         : [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'config-drive/model']],
+                                    extensions         : [
+                                        [$class: 'RelativeTargetDirectory', relativeTargetDir: 'config-drive/model'],
+                                        [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, trackingSubmodules: false],
+                                    ],
                                     userRemoteConfigs  : [[url: model, refspec: extra_vars.get('CLUSTER_MODEL_REF', 'master'), credentialsId: gerritCredentials]]
                             ])
 
@@ -162,6 +164,20 @@
                             if (clusterName == 'mcp-offline' && mcpVersion != '') {
                                 def filePath = 'classes/cluster/mcp-offline/infra/apt01_dummy.yml'
                                 sh "sed -i 's/mcp_version: .*/mcp_version: ${mcpVersion}/' config-drive/model/${filePath}"
+                                // speed up build by using internal mirrors in the same region
+                                if (os_openrc.get('CLOUD_REGION', 'US').matches("[Ee][Uu]")) {
+                                    sh "sed -i 's/debmirror_mirrors_host: .*/debmirror_mirrors_host: mirror-eu.mcp.mirantis.net/' config-drive/model/${filePath}"
+                                }
+                            }
+
+                            def reclass_url = extra_vars.get('RECLASS_SYSTEM_URL', '')
+                            def reclass_ref = extra_vars.get('RECLASS_SYSTEM_REF', '')
+                            if (reclass_url && reclass_ref) {
+                                if (fileExists('config-drive/model/classes/system')) {
+                                    dir('config-drive/model/classes/system') {
+                                        gerrit.gerritPatchsetCheckout(reclass_url, reclass_ref, "HEAD", gerritCredentials)
+                                    }
+                                }
                             }
                         }
                         def scripts = extra_vars.get('GIT_SALT_FORMULAS_SCRIPTS', '')