Disable stage3 in branch WIM

[osm/devops.git] / packer / ubuntu1604-juju.json

diff --git a/packer/ubuntu1604-juju.json b/packer/ubuntu1604-juju.json
index 15db312..36b2509 100644 (file)
--- a/packer/ubuntu1604-juju.json
+++ b/packer/ubuntu1604-juju.json
@@ -3,12 +3,11 @@
     {
       "type": "shell",
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
-      "script": "scripts/install_packages.sh"
+      "script": "scripts/setup.sh"
     },
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
-      "script": "scripts/setup.sh"
+      "script": "scripts/install_packages.sh"
     },
     {
         "type": "file",
@@ -34,6 +33,9 @@
         "script": "scripts/cleanup.sh"
     }
   ],
+  "variables": {
+    "build_dir": "jujubase-{{timestamp}}"
+  },
   "builders": [
     {
       "type": "virtualbox-iso",
@@ -64,16 +66,16 @@
         "<enter><wait>"
       ],
       "boot_wait": "10s",
-      "disk_size": 20480,
+      "disk_size": 40000,
       "guest_os_type": "Ubuntu_64",
       "headless": true,
       "http_directory": "http",
       "iso_urls": [
-        "iso/ubuntu-16.04.4-server-amd64.iso",
-        "http://releases.ubuntu.com/16.04/ubuntu-16.04.4-server-amd64.iso"
+        "iso/ubuntu-16.04.5-server-amd64.iso",
+        "http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso"
       ],
       "iso_checksum_type": "sha256",
-      "iso_checksum": "0a03608988cfd2e50567990dc8be96fb3c501e198e2e6efcb846d89efc7b89f2",
+      "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -81,7 +83,7 @@
       "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
       "virtualbox_version_file": ".vbox_version",
-      "output_directory": "jujubase-{{timestamp}}",
+      "output_directory": "{{user `build_dir`}}",
       "vm_name": "xenial-jujubase",
       "vboxmanage": [
         [
@@ -101,7 +103,7 @@
   ],
   "post-processors": [
     {
-      "output": "jujubase-{{timestamp}}/{{.Provider}}-jujubase.box",
+      "output": "{{user `build_dir`}}/{{.Provider}}-jujubase.box",
       "type": "vagrant",
       "keep_input_artifact": true
     }