Skip to content

Commit 3a1225a

Browse files
rasarasa
committed
Added 3 new boxes, minor other fixes
Added eval-win7x86-enterprise box Added eval-win81x86-enterprise box Added eval-win8x64-enterprise box Added installation of 64bit version of sevenzip, when applicable Quieted spurious message in 00-run-all-scripts.cmd Improved script/regenerate-dotnet-cache.cmd Updated Sevenzip URL to 9.35 Updated VMware Tools URL to 9.9.0
1 parent 18c24cb commit 3a1225a

23 files changed

+1268
-54
lines changed

‎.windows/isos/Makefile

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
#
22

3-
EVAL_WIN7_X64 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso
4-
EVAL_WIN81_X64 ?= http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO
53
EVAL_WIN2008R2_X64 ?= http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso
64
EVAL_WIN2012R2_X64 ?= http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO
5+
EVAL_WIN7_X64 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso
6+
EVAL_WIN81_X64 ?= http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO
77

8-
EVAL_WIN7_X32 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso
9-
EVAL_WIN8_X64 ?= http://download.microsoft.com/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO
108
EVAL_WIN2012_X64 ?= http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO
9+
EVAL_WIN7_X32 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso
1110
EVAL_WIN81_X32 ?= http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X86FREE_EN-US_DV5.ISO
11+
EVAL_WIN8_X64 ?= http://download.microsoft.com/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO
1212

13-
EVAL_WIN7_X64_NAME ?= $(shell basename ${EVAL_WIN7_X64})
14-
EVAL_WIN81_X64_NAME ?= $(shell basename $(EVAL_WIN81_X64))
1513
EVAL_WIN2008R2_X64_NAME ?= $(shell basename $(EVAL_WIN2008R2_X64))
1614
EVAL_WIN2012R2_X64_NAME ?= $(shell basename $(EVAL_WIN2012R2_X64))
15+
EVAL_WIN7_X64_NAME ?= $(shell basename ${EVAL_WIN7_X64})
16+
EVAL_WIN81_X64_NAME ?= $(shell basename $(EVAL_WIN81_X64))
1717

18-
EVAL_WIN7_X32_NAME ?= $(shell basename $(EVAL_WIN7_X32))
19-
EVAL_WIN8_X64_NAME ?= $(shell basename $(EVAL_WIN8_X64))
2018
EVAL_WIN2012_X64_NAME ?= $(shell basename $(EVAL_WIN2012_X64))
19+
EVAL_WIN7_X32_NAME ?= $(shell basename $(EVAL_WIN7_X32))
2120
EVAL_WIN81_X32_NAME ?= $(shell basename $(EVAL_WIN81_X32))
21+
EVAL_WIN8_X64_NAME ?= $(shell basename $(EVAL_WIN8_X64))
2222

2323
WGET ?= wget
2424

2525
.PHONY: isos
2626
isos: \
27-
$(EVAL_WIN7_X64_NAME) \
28-
$(EVAL_WIN81_X32_NAME) \
2927
$(EVAL_WIN2008R2_X64_NAME) \
28+
$(EVAL_WIN2012_X64_NAME) \
3029
$(EVAL_WIN2012R2_X64_NAME) \
3130
$(EVAL_WIN7_X32_NAME) \
32-
$(EVAL_WIN8_X64_NAME) \
31+
$(EVAL_WIN7_X64_NAME) \
32+
$(EVAL_WIN81_X32_NAME) \
3333
$(EVAL_WIN81_X64_NAME) \
34-
$(EVAL_WIN2012_X64_NAME)
35-
36-
$(EVAL_WIN7_X64_NAME):
37-
$(WGET) $(EVAL_WIN7_X64)
38-
39-
$(EVAL_WIN81_X32_NAME):
40-
$(WGET) $(EVAL_WIN81_X32)
34+
$(EVAL_WIN8_X64_NAME)
4135

4236
$(EVAL_WIN2008R2_X64_NAME):
4337
$(WGET) $(EVAL_WIN2008R2_X64)
4438

39+
$(EVAL_WIN2012_X64_NAME):
40+
$(WGET) $(EVAL_WIN2012_X64)
41+
4542
$(EVAL_WIN2012R2_X64_NAME):
4643
$(WGET) $(EVAL_WIN2012R2_X64)
4744

4845
$(EVAL_WIN7_X32_NAME):
4946
$(WGET) $(EVAL_WIN7_X32)
5047

51-
$(EVAL_WIN8_X64_NAME):
52-
$(WGET) $(EVAL_WIN8_X64)
48+
$(EVAL_WIN7_X64_NAME):
49+
$(WGET) $(EVAL_WIN7_X64)
50+
51+
$(EVAL_WIN81_X32_NAME):
52+
$(WGET) $(EVAL_WIN81_X32)
5353

5454
$(EVAL_WIN81_X64_NAME):
5555
$(WGET) $(EVAL_WIN81_X64)
5656

57-
$(EVAL_WIN2012_X64_NAME):
58-
$(WGET) $(EVAL_WIN2012_X64)
57+
$(EVAL_WIN8_X64_NAME):
58+
$(WGET) $(EVAL_WIN8_X64)
5959

6060
.PHONY: hash
6161
hash:

‎.windows/provisions/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ PUPPET_URL?=https://downloads.puppetlabs.com/windows/puppet-3.7.3.msi
1414
SALT_32_URL?=https://docs.saltstack.com/downloads/Salt-Minion-2014.7.0-x86-Setup.exe
1515
SALT_64_URL?=https://docs.saltstack.com/downloads/Salt-Minion-2014.7.0-AMD64-Setup.exe
1616
SDELETE_URL?=http://live.sysinternals.com/sdelete.exe
17-
SEVENZIP_32_URL?=http://downloads.sourceforge.net/sevenzip/7z922.msi
18-
SEVENZIP_64_URL?=http://downloads.sourceforge.net/sevenzip/7z922-x64.msi
17+
SEVENZIP_32_URL?=http://downloads.sourceforge.net/sevenzip/7z935.msi
18+
SEVENZIP_64_URL?=http://downloads.sourceforge.net/sevenzip/7z935-x64.msi
1919
ULTRADEFRAG_32_URL=http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-6.0.4.bin.i386.zip
2020
ULTRADEFRAG_64_URL=http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-6.0.4.bin.amd64.zip
2121
UNXTUTILS_URL?=http://downloads.sourceforge.net/unxutils/UnxUtils.zip

‎Makefile

+20
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ EVAL_WIN2008R2_X64_CHECKSUM ?= beed231a34e90e1dd9a04b3afabec31d62ce3889
1212
EVAL_WIN2012R2_X64 ?= http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO
1313
EVAL_WIN2012R2_X64_CHECKSUM ?= 7e3f89dbff163e259ca9b0d1f078daafd2fed513
1414

15+
EVAL_WIN7_X86 ?= http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso
16+
EVAL_WIN7_X86_CHECKSUM ?= 971fc00183a52c152fe924a6b99fdec011a871c2
17+
EVAL_WIN81_X86 ?= http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X86FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X86FREE_EN-US_DV5.ISO
18+
EVAL_WIN81_X86_CHECKSUM ?= e2c60b093b11b99c8f021c518249f4c42093efe2
19+
EVAL_WIN8_X64 ?= http://download.microsoft.com/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X64FREE_EN-US_DV5.ISO
20+
EVAL_WIN8_X64_CHECKSUM ?= ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d
21+
22+
# @todo:
23+
EVAL_WIN2012_X64 ?= http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO
24+
EVAL_WIN2012_X64_CHECKSUM ?= 922b365c3360ce630f6a4b4f2f3c79e66165c0fb
25+
1526
WIN2008R2_X64 ?= iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso
1627
WIN2008R2_X64_CHECKSUM ?= 7e7e9425041b3328ccf723a0855c2bc4f462ec57
1728
WIN2012_X64 ?= iso/win2012/en_windows_server_2012_x64_dvd_915478.iso
@@ -316,6 +327,15 @@ $(eval $(call BUILDBOX,win81x64-pro,$(WIN81_X64_PRO),$(WIN81_X64_PRO_CHECKSUM)))
316327

317328
$(eval $(call BUILDBOX,win81x86-pro,$(WIN81_X86_PRO),$(WIN81_X86_PRO_CHECKSUM)))
318329

330+
$(eval $(call BUILDBOX,eval-win7x86-enterprise,$(EVAL_WIN7_X86),$(EVAL_WIN7_X86_CHECKSUM)))
331+
332+
$(eval $(call BUILDBOX,eval-win81x86-enterprise,$(EVAL_WIN81_X86),$(EVAL_WIN81_X86_CHECKSUM)))
333+
334+
$(eval $(call BUILDBOX,eval-win8x64-enterprise,$(EVAL_WIN8_X64),$(EVAL_WIN8_X64_CHECKSUM)))
335+
336+
# @todo:
337+
#$(eval $(call BUILDBOX,eval-win2012-standard,$(EVAL_WIN2012_X64),$(EVAL_WIN2012_X64_CHECKSUM)))
338+
319339
# can't find powershell:
320340
#$(eval $(call BUILDBOX,win2008r2-standardcore,$(WIN2008R2_X64),$(WIN2008R2_X64_CHECKSUM)))
321341
#$(eval $(call BUILDBOX,win2008r2-standardcore-cygwin,$(WIN2008R2_X64),$(WIN2008R2_X64_CHECKSUM)))

‎eval-win7x86-enterprise-cygwin.json

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
{
2+
"variables": {
3+
"version": "0.1.0",
4+
"cm": "chef",
5+
"cm_version": "",
6+
"iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso",
7+
"iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
8+
"shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
9+
"update": true
10+
},
11+
"builders": [
12+
{
13+
"vm_name": "eval-win7x86-enterprise-cygwin",
14+
"type": "vmware-iso",
15+
"guest_os_type": "windows7",
16+
"iso_url": "{{ user `iso_url` }}",
17+
"iso_checksum": "{{ user `iso_checksum` }}",
18+
"iso_checksum_type": "sha1",
19+
"ssh_username": "vagrant",
20+
"ssh_password": "vagrant",
21+
"floppy_files": [
22+
"floppy/win7x86-enterprise/Autounattend.xml",
23+
"floppy/00-run-all-scripts.cmd",
24+
"floppy/install-winrm.cmd",
25+
"floppy/fixnetwork.ps1",
26+
"floppy/powerconfig.bat",
27+
"floppy/01-install-wget.cmd",
28+
"floppy/_download.cmd",
29+
"floppy/_packer_config.cmd",
30+
"floppy/passwordchange.bat",
31+
"floppy/networkprompt.bat",
32+
"floppy/disablewinupdate.bat",
33+
"floppy/cygwin.bat",
34+
"floppy/cygwin.sh",
35+
"floppy/zz-start-sshd.cmd"
36+
],
37+
"tools_upload_flavor": "windows",
38+
"ssh_wait_timeout": "10000s",
39+
"shutdown_command": "{{ user `shutdown_command`}}",
40+
"disk_size": 40960,
41+
"vmx_data": {
42+
"memsize": "768",
43+
"numvcpus": "1",
44+
"cpuid.coresPerSocket": "1"
45+
}
46+
},
47+
{
48+
"vm_name": "eval-win7x86-enterprise-cygwin",
49+
"type": "virtualbox-iso",
50+
"guest_os_type": "Windows7",
51+
"iso_url": "{{ user `iso_url` }}",
52+
"iso_checksum": "{{ user `iso_checksum` }}",
53+
"iso_checksum_type": "sha1",
54+
"ssh_username": "vagrant",
55+
"ssh_password": "vagrant",
56+
"ssh_wait_timeout": "10000s",
57+
"disk_size": 40960,
58+
"floppy_files": [
59+
"floppy/win7x86-enterprise/Autounattend.xml",
60+
"floppy/00-run-all-scripts.cmd",
61+
"floppy/install-winrm.cmd",
62+
"floppy/fixnetwork.ps1",
63+
"floppy/powerconfig.bat",
64+
"floppy/01-install-wget.cmd",
65+
"floppy/_download.cmd",
66+
"floppy/_packer_config.cmd",
67+
"floppy/passwordchange.bat",
68+
"floppy/networkprompt.bat",
69+
"floppy/disablewinupdate.bat",
70+
"floppy/cygwin.bat",
71+
"floppy/cygwin.sh",
72+
"floppy/zz-start-sshd.cmd",
73+
"floppy/oracle-cert.cer"
74+
],
75+
"shutdown_command": "{{ user `shutdown_command`}}",
76+
"disk_size": 40960,
77+
"vboxmanage": [
78+
["modifyvm", "{{.Name}}", "--memory", "768"],
79+
["modifyvm", "{{.Name}}", "--cpus", "1"]
80+
]
81+
}
82+
],
83+
"provisioners": [
84+
{
85+
"type": "shell",
86+
"remote_path": "/tmp/script.bat",
87+
"environment_vars": [
88+
"CM={{user `cm`}}",
89+
"CM_VERSION={{user `cm_version`}}",
90+
"UPDATE={{user `update`}}"
91+
],
92+
"execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
93+
"scripts": [
94+
"script/vagrant.bat",
95+
"script/cmtool.bat",
96+
"script/vmtool.bat",
97+
"script/clean.bat",
98+
"script/ultradefrag.bat",
99+
"script/uninstall-7zip.bat",
100+
"script/sdelete.bat"
101+
]
102+
},
103+
{
104+
"type": "shell",
105+
"inline": ["rm -f /tmp/script.bat"]
106+
}
107+
],
108+
"post-processors": [{
109+
"type": "vagrant",
110+
"keep_input_artifact": false,
111+
"compression_level": 1,
112+
"vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl",
113+
"output": "box/{{.Provider}}/eval-win7x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
114+
}]
115+
}

‎eval-win7x86-enterprise.json

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"variables": {
3+
"version": "0.1.0",
4+
"cm": "chef",
5+
"cm_version": "",
6+
"iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso",
7+
"iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2",
8+
"shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'",
9+
"update": true
10+
},
11+
"builders": [
12+
{
13+
"vm_name": "eval-win7x86-enterprise",
14+
"type": "vmware-iso",
15+
"guest_os_type": "windows7",
16+
"iso_url": "{{ user `iso_url` }}",
17+
"iso_checksum": "{{ user `iso_checksum` }}",
18+
"iso_checksum_type": "sha1",
19+
"ssh_username": "vagrant",
20+
"ssh_password": "vagrant",
21+
"floppy_files": [
22+
"floppy/win7x86-enterprise/Autounattend.xml",
23+
"floppy/00-run-all-scripts.cmd",
24+
"floppy/install-winrm.cmd",
25+
"floppy/fixnetwork.ps1",
26+
"floppy/powerconfig.bat",
27+
"floppy/01-install-wget.cmd",
28+
"floppy/_download.cmd",
29+
"floppy/_packer_config.cmd",
30+
"floppy/passwordchange.bat",
31+
"floppy/networkprompt.bat",
32+
"floppy/disablewinupdate.bat",
33+
"floppy/openssh.bat",
34+
"floppy/zz-start-sshd.cmd"
35+
],
36+
"tools_upload_flavor": "windows",
37+
"ssh_wait_timeout": "10000s",
38+
"shutdown_command": "{{ user `shutdown_command`}}",
39+
"disk_size": 40960,
40+
"vmx_data": {
41+
"memsize": "768",
42+
"numvcpus": "1",
43+
"cpuid.coresPerSocket": "1"
44+
}
45+
},
46+
{
47+
"vm_name": "eval-win7x86-enterprise",
48+
"type": "virtualbox-iso",
49+
"guest_os_type": "Windows7",
50+
"iso_url": "{{ user `iso_url` }}",
51+
"iso_checksum": "{{ user `iso_checksum` }}",
52+
"iso_checksum_type": "sha1",
53+
"ssh_username": "vagrant",
54+
"ssh_password": "vagrant",
55+
"ssh_wait_timeout": "10000s",
56+
"disk_size": 40960,
57+
"floppy_files": [
58+
"floppy/win7x86-enterprise/Autounattend.xml",
59+
"floppy/00-run-all-scripts.cmd",
60+
"floppy/install-winrm.cmd",
61+
"floppy/fixnetwork.ps1",
62+
"floppy/powerconfig.bat",
63+
"floppy/01-install-wget.cmd",
64+
"floppy/_download.cmd",
65+
"floppy/_packer_config.cmd",
66+
"floppy/passwordchange.bat",
67+
"floppy/networkprompt.bat",
68+
"floppy/disablewinupdate.bat",
69+
"floppy/openssh.bat",
70+
"floppy/zz-start-sshd.cmd",
71+
"floppy/oracle-cert.cer"
72+
],
73+
"shutdown_command": "{{ user `shutdown_command`}}",
74+
"disk_size": 40960,
75+
"vboxmanage": [
76+
["modifyvm", "{{.Name}}", "--memory", "768"],
77+
["modifyvm", "{{.Name}}", "--cpus", "1"]
78+
]
79+
}
80+
],
81+
"provisioners": [
82+
{
83+
"type": "shell",
84+
"remote_path": "/tmp/script.bat",
85+
"environment_vars": [
86+
"CM={{user `cm`}}",
87+
"CM_VERSION={{user `cm_version`}}",
88+
"UPDATE={{user `update`}}"
89+
],
90+
"execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat",
91+
"scripts": [
92+
"script/vagrant.bat",
93+
"script/cmtool.bat",
94+
"script/vmtool.bat",
95+
"script/clean.bat",
96+
"script/ultradefrag.bat",
97+
"script/uninstall-7zip.bat",
98+
"script/sdelete.bat"
99+
]
100+
},
101+
{
102+
"type": "shell",
103+
"inline": ["rm -f /tmp/script.bat"]
104+
}
105+
],
106+
"post-processors": [{
107+
"type": "vagrant",
108+
"keep_input_artifact": false,
109+
"compression_level": 1,
110+
"vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise.tpl",
111+
"output": "box/{{.Provider}}/eval-win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box"
112+
}]
113+
}

0 commit comments

Comments
 (0)