for i in *.json ; do packer fix $i >$i.tmp ; mv -f $i.tmp $i; done

fokk · Feb 23, 2015 · 06148f1 · 06148f1
1 parent ed33144
commit 06148f1
Show file tree

Hide file tree

Showing 64 changed files with 5,682 additions and 3,916 deletions.
diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json
@@ -1,24 +1,7 @@
 {
-  "variables": {
-    "version": "0.1.0",
-    "cm": "chef",
-    "cm_version": "",
-    "iso_url": "http://iso.esd.microsoft.com/W9TPI/B6B0A0278A90510669EAB90ABF80B22A/Windows10_TechnicalPreview_x64_EN-US_9926.iso",
-    "iso_checksum": "6a95316728299d95249a29fbeb9676ded23b8beb",
-    "update": true,
-    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'"
-  },
   "builders": [
     {
-      "vm_name": "eval-win10x64-enterprise-cygwin",
-      "type": "vmware-iso",
-      "guest_os_type": "windows8srv-64",
-      "iso_url": "{{ user `iso_url` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
+      "disk_size": 40960,
       "floppy_files": [
         "floppy/eval-win10x64-enterprise/Autounattend.xml",
         "floppy/00-run-all-scripts.cmd",
@@ -33,26 +16,26 @@
         "floppy/cygwin.sh",
         "floppy/zz-start-sshd.cmd"
       ],
-      "tools_upload_flavor": "windows",
+      "guest_os_type": "windows8srv-64",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "iso_url": "{{ user `iso_url` }}",
       "shutdown_command": "{{ user `shutdown_command`}}",
-      "disk_size": 40960,
+      "ssh_password": "vagrant",
+      "ssh_username": "vagrant",
+      "ssh_wait_timeout": "10000s",
+      "tools_upload_flavor": "windows",
+      "type": "vmware-iso",
+      "vm_name": "eval-win10x64-enterprise-cygwin",
       "vmx_data": {
+        "cpuid.coresPerSocket": "1",
         "memsize": "1536",
         "numvcpus": "1",
-        "cpuid.coresPerSocket": "1",
         "scsi0.virtualDev": "lsisas1068"
       }
     },
     {
-      "vm_name": "eval-win10x64-enterprise-cygwin",
-      "type": "virtualbox-iso",
-      "guest_os_type": "Windows81_64",
-      "iso_url": "{{ user `iso_url` }}",
-      "iso_checksum": "{{ user `iso_checksum` }}",
-      "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
-      "ssh_password": "vagrant",
-      "ssh_wait_timeout": "10000s",
+      "disk_size": 40960,
       "floppy_files": [
         "floppy/eval-win10x64-enterprise/Autounattend.xml",
         "floppy/00-run-all-scripts.cmd",
@@ -68,24 +51,39 @@
         "floppy/zz-start-sshd.cmd",
         "floppy/oracle-cert.cer"
       ],
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "disk_size": 40960,
-      "vboxmanage": [
-        ["modifyvm", "{{.Name}}", "--memory", "1536"],
-        ["modifyvm", "{{.Name}}", "--cpus", "1"],
-        ["setextradata", "{{.Name}}", "VBoxInternal/CPUM/CMPXCHG16B", "1"]
-      ]
-    },
-    {
-      "vm_name": "eval-win10x64-enterprise-cygwin",
-      "type": "parallels-iso",
-      "guest_os_type": "win-8.1",
-      "iso_url": "{{ user `iso_url` }}",
+      "guest_os_type": "Windows81_64",
       "iso_checksum": "{{ user `iso_checksum` }}",
       "iso_checksum_type": "sha1",
-      "ssh_username": "vagrant",
+      "iso_url": "{{ user `iso_url` }}",
+      "shutdown_command": "{{ user `shutdown_command`}}",
       "ssh_password": "vagrant",
+      "ssh_username": "vagrant",
       "ssh_wait_timeout": "10000s",
+      "type": "virtualbox-iso",
+      "vboxmanage": [
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--memory",
+          "1536"
+        ],
+        [
+          "modifyvm",
+          "{{.Name}}",
+          "--cpus",
+          "1"
+        ],
+        [
+          "setextradata",
+          "{{.Name}}",
+          "VBoxInternal/CPUM/CMPXCHG16B",
+          "1"
+        ]
+      ],
+      "vm_name": "eval-win10x64-enterprise-cygwin"
+    },
+    {
+      "disk_size": 40960,
       "floppy_files": [
         "floppy/eval-win10x64-enterprise/Autounattend.xml",
         "floppy/00-run-all-scripts.cmd",
@@ -100,25 +98,51 @@
         "floppy/cygwin.sh",
         "floppy/zz-start-sshd.cmd"
       ],
+      "guest_os_type": "win-8.1",
+      "iso_checksum": "{{ user `iso_checksum` }}",
+      "iso_checksum_type": "sha1",
+      "iso_url": "{{ user `iso_url` }}",
       "parallels_tools_flavor": "win",
-      "shutdown_command": "{{ user `shutdown_command`}}",
-      "disk_size": 40960,
       "prlctl": [
-        ["set", "{{.Name}}", "--memsize", "1536"],
-        ["set", "{{.Name}}", "--cpus", "1"]
-      ]
+        [
+          "set",
+          "{{.Name}}",
+          "--memsize",
+          "1536"
+        ],
+        [
+          "set",
+          "{{.Name}}",
+          "--cpus",
+          "1"
+        ]
+      ],
+      "shutdown_command": "{{ user `shutdown_command`}}",
+      "ssh_password": "vagrant",
+      "ssh_username": "vagrant",
+      "ssh_wait_timeout": "10000s",
+      "type": "parallels-iso",
+      "vm_name": "eval-win10x64-enterprise-cygwin"
+    }
+  ],
+  "post-processors": [
+    {
+      "compression_level": 1,
+      "keep_input_artifact": false,
+      "output": "box/{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "type": "vagrant",
+      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl"
     }
   ],
   "provisioners": [
     {
-      "type": "shell",
-      "remote_path": "/tmp/script.bat",
       "environment_vars": [
         "CM={{user `cm`}}",
         "CM_VERSION={{user `cm_version`}}",
         "UPDATE={{user `update`}}"
       ],
       "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
+      "remote_path": "/tmp/script.bat",
       "scripts": [
         "script/vagrant.bat",
         "script/cmtool.bat",
@@ -127,18 +151,24 @@
         "script/ultradefrag.bat",
         "script/uninstall-7zip.bat",
         "script/sdelete.bat"
-      ]
+      ],
+      "type": "shell"
     },
     {
-      "type": "shell",
-      "inline": ["rm -f /tmp/script.bat"]
+      "inline": [
+        "rm -f /tmp/script.bat"
+      ],
+      "type": "shell"
     }
   ],
-  "post-processors": [{
-    "type": "vagrant",
-    "keep_input_artifact": false,
-    "compression_level": 1,
-    "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl",
-    "output": "box/{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
-  }]
+  "variables": {
+    "cm": "chef",
+    "cm_version": "",
+    "iso_checksum": "6a95316728299d95249a29fbeb9676ded23b8beb",
+    "iso_url": "http://iso.esd.microsoft.com/W9TPI/B6B0A0278A90510669EAB90ABF80B22A/Windows10_TechnicalPreview_x64_EN-US_9926.iso",
+    "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
+    "update": true,
+    "version": "0.1.0"
+  }
 }
+