Skip to content
This repository has been archived by the owner on May 9, 2021. It is now read-only.

Making cmtool.sh to run last followed by an optional custom_script #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Making cmtool.sh to run last followed by an optional custom_script #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ Makefile.local
box/

.DS_Store
custom.sh
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ PACKER_VARS_LIST = 'cm=$(CM)' 'headless=$(HEADLESS)' 'update=$(UPDATE)' 'version
ifdef CM_VERSION
PACKER_VARS_LIST += 'cm_version=$(CM_VERSION)'
endif
ifdef CUSTOM_SCRIPT
PACKER_VARS_LIST += 'custom_script=$(CUSTOM_SCRIPT)'
endif
PACKER_VARS := $(addprefix -var , $(PACKER_VARS_LIST))
ifdef PACKER_DEBUG
PACKER := PACKER_LOG=1 $(PACKER) --debug
Expand Down
6 changes: 4 additions & 2 deletions centos510-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos510-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos510.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos510",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos511-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos511-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos511.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos511",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos59-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos59-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos59.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos59",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos64-desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos64-desktop",
Expand Down Expand Up @@ -111,8 +112,9 @@
"script/vagrant.sh",
"script/desktop.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos64-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos64-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos64",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos65-desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos65-desktop",
Expand Down Expand Up @@ -111,8 +112,9 @@
"script/vagrant.sh",
"script/desktop.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
8 changes: 5 additions & 3 deletions centos65-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos65-docker",
Expand Down Expand Up @@ -110,9 +111,10 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cmtool.sh",
"script/docker.sh",
"script/cleanup.sh"
"script/cleanup.sh",
"script/cmtool.sh",
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos65-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos65-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos65.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos65",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos66-desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos66-desktop",
Expand Down Expand Up @@ -111,8 +112,9 @@
"script/vagrant.sh",
"script/desktop.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
8 changes: 5 additions & 3 deletions centos66-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos66-docker",
Expand Down Expand Up @@ -110,9 +111,10 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cmtool.sh",
"script/docker.sh",
"script/cleanup.sh"
"script/cleanup.sh",
"script/cmtool.sh",
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos66-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos66-i386",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos66.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos66",
Expand Down Expand Up @@ -110,8 +111,9 @@
"script/update.sh",
"script/vagrant.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
6 changes: 4 additions & 2 deletions centos70-desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"https_proxy": "{{env `https_proxy`}}",
"ftp_proxy": "{{env `ftp_proxy`}}",
"rsync_proxy": "{{env `rsync_proxy`}}",
"no_proxy": "{{env `no_proxy`}}"
"no_proxy": "{{env `no_proxy`}}",
"custom_script": "."
},
"builders": [{
"vm_name": "centos70-desktop",
Expand Down Expand Up @@ -112,8 +113,9 @@
"script/vagrant.sh",
"script/desktop.sh",
"script/vmtool.sh",
"script/cleanup.sh",
"script/cmtool.sh",
"script/cleanup.sh"
"{{ user `custom_script` }}"
]
}],
"post-processors": [{
Expand Down
Loading