commit f7118c1835fdde18490399c0a86aad852661f307
author Pavel Cizinsky <pcizinsky@mirantis.com> Mon Feb 11 14:34:59 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Feb 11 14:34:59 2019 +0000
tree 652158fa3f42ed29b7ce3a4b7460809891593ce1
parent b9afd23b6ad444e49898816cc5e5edef4654186e
parent f67b39a21f83c4bc7fcca19f297adb74e4fc9deb

Merge "Add 'retries_wait' parameter for enforceState method"

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index c93587f..2dd9b38 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -55,11 +55,11 @@
             def repoDateUsed = new Date().parse(releaseNaming, distribRevision)
             def extraAvailableFrom = new Date().parse(releaseNaming, '2018.11.0')
             if (repoDateUsed < extraAvailableFrom) {
-              extraRepoSource = "deb http://apt.mcp.mirantis.net/xenial ${distribRevision} extra"
+                extraRepoSource = "deb http://apt.mcp.mirantis.net/xenial ${distribRevision} extra"
             }
         } catch (Exception e) {
             common.warningMsg(e)
-            if ( !(distribRevision in [ 'nightly', 'proposed', 'testing' ] )) {
+            if (!(distribRevision in ['nightly', 'proposed', 'testing'])) {
                 extraRepoSource = "deb [arch=amd64] http://apt.mcp.mirantis.net/xenial ${distribRevision} extra"
             }
         }
@@ -195,16 +195,16 @@
     sh "mkdir -p ${env.WORKSPACE}/old ${env.WORKSPACE}/new"
     def configRun = [
         'distribRevision': distribRevision,
-        'dockerExtraOpts' : [
+        'dockerExtraOpts': [
             "-v /srv/salt/reclass:/srv/salt/reclass:ro",
             "-v /etc/salt:/etc/salt:ro",
             "-v /usr/share/salt-formulas/:/usr/share/salt-formulas/:ro"
         ],
-        'envOpts'         : [
+        'envOpts'        : [
             "WORKSPACE=${env.WORKSPACE}",
             "NODES_LIST=${targetNodes.join(' ')}"
         ],
-        'runCommands'     : [
+        'runCommands'    : [
             '001_Update_Reclass_package'    : {
                 sh('apt-get update && apt-get install -y reclass')
             },
@@ -291,7 +291,13 @@
         },
 
         '002_Prepare_something'          : {
-            sh('''rsync -ah ${RECLASS_ENV}/* /srv/salt/reclass && echo '127.0.1.2  salt' >> /etc/hosts
+            sh('''#!/bin/bash -x
+              rsync -ah ${RECLASS_ENV}/* /srv/salt/reclass && echo '127.0.1.2  salt' >> /etc/hosts
+              if [ -f '/srv/salt/reclass/salt_master_pillar.asc' ] ; then
+                mkdir -p /etc/salt/gpgkeys
+                chmod 700 /etc/salt/gpgkeys
+                GNUPGHOME=/etc/salt/gpgkeys gpg --import /srv/salt/reclass/salt_master_pillar.asc
+              fi
               cd /srv/salt && find . -type f \\( -name '*.yml' -or -name '*.sh' \\) -exec sed -i 's/apt-mk.mirantis.com/apt.mcp.mirantis.net/g' {} \\;
               cd /srv/salt && find . -type f \\( -name '*.yml' -or -name '*.sh' \\) -exec sed -i 's/apt.mirantis.com/apt.mcp.mirantis.net/g' {} \\;
             ''')