commit 738ce8233fe4ff14b89dead05cd6965cb774e705
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Nov 16 13:00:24 2018 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Nov 23 16:21:51 2018 +0400
tree a272e62b0e46872ba0c3ed0371a96ae8eaff914a
parent 05c8ee7dbfb8e915500163f7d7b447fb0725b96b

Update jenkins installation on CFG day01 image

Change-Id: I4c505dff0adb2dcee02cdb7d5f6b288455e5dd12
Related-task: #PROD-24934 (PROD:24934)

day01-image/template.json

diff --git a/day01-image/template.json b/day01-image/template.json
index fd61aaa..e7d90d3 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -30,8 +30,24 @@
     },
     {
       "type": "file",
-      "source": "files/tmp/bootstrap.saltstack.com.sh",
-      "destination": "/tmp/bootstrap.saltstack.com.sh"
+      "source": "files/opt/bootstrap.saltstack.com.sh",
+      "destination": "/opt/bootstrap.saltstack.com.sh"
+    },
+    {
+      "environment_vars": [
+        "UBUNTU_BASEURL={{ user `ubuntu_baseurl` }}",
+        "PACKER_OFFLINE_BUILD=true"
+      ],
+      "type": "shell",
+      "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+      "expect_disconnect": "true",
+      "scripts": [
+        "scripts/base_set_hostname.sh",
+        "scripts/base.sh",
+        "scripts/motd.sh",
+        "scripts/network.sh",
+        "scripts/reboot.sh"
+      ]
     },
     {
       "environment_vars": [
@@ -40,7 +56,6 @@
         "CLUSTER_NAME={{ user `cluster_name` }}",
         "BS_HOSTNAME={{ user `bs_hostname` }}",
         "FORMULA_VERSION={{ user `formula_version` }}",
-        "UBUNTU_BASEURL={{ user `ubuntu_baseurl` }}",
         "SALTSTACK_GPG={{ user `saltstack_gpg` }}",
         "SALTSTACK_REPO={{ user `saltstack_repo` }}",
         "APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
@@ -48,16 +63,17 @@
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
         "APT_REPOSITORY={{ user `apt_repository` }}",
         "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
+        "FORMULA_VERSION={{ user `formula_version` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
+        "BOOTSTRAP_SALTSTACK_COM=file:///opt/bootstrap.saltstack.com.sh",
+        "MCP_VERSION={{ user `mcp_version` }}",
         "PACKER_OFFLINE_BUILD=true"
       ],
       "type": "shell",
+      "pause_before": "60s",
       "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+      "expect_disconnect": "true",
       "scripts": [
-        "scripts/base_set_hostname.sh",
-        "scripts/base.sh",
-        "scripts/motd.sh",
-        "scripts/network.sh",
         "scripts/salt_bootstrap.sh",
         "scripts/salt.sh"
       ]
@@ -70,7 +86,7 @@
     {
       "type": "file",
       "source": "files/var/jenkins",
-      "destination": "/var/lib/jenkins/org.codefirst.SimpleThemeDecorator.xml"
+      "destination": "/srv/volumes/jenkins/org.codefirst.SimpleThemeDecorator.xml"
     },
     {
       "environment_vars": [