Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/vmware restoration/#75 #77

Merged
merged 4 commits into from
Oct 5, 2020
+7 −49
Merged

Bug/vmware restoration/#75 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fd7ded
removing more filters
elreydetoda Oct 4, 2020
d4681b5
linting vmware packer builder
elreydetoda Oct 5, 2020
cee7b5d
closes #76
elreydetoda Oct 5, 2020
8782f32
helps if you validate the right template...
elreydetoda Oct 5, 2020
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
53 changes: 6 additions & 47 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ jobs:
- run: cp -v /tmp/packer_workspace/* .
- run: packer version
- packer-lint:
template-file: templates/template.json
vars-file: templates/example-variables.json
template-file: kali-template.json
vars-file: variables.json
only-builder: vmware-iso

packer-linting_aws:
Expand Down Expand Up @@ -642,11 +642,10 @@ workflows:
- master
- dev-stage
- packer-linting_vbox:
filters:
branches:
ignore:
- master
- dev-stage
requires:
- generate-packer-vars
- generate-packer-file
- packer-linting_vmware:
requires:
- generate-packer-vars
- generate-packer-file
Expand Down Expand Up @@ -699,10 +698,6 @@ workflows:
only:
- master
- packer-linting_vbox:
filters:
branches:
only:
- master
requires:
- generate-packer-vars
- generate-packer-file
Expand All @@ -714,31 +709,15 @@ workflows:
- python-linting
- ansible-linting
- terraform-packet_deploy:
filters:
branches:
only:
- master
requires:
- packer-linting_vbox
- ansible-bootstrap:
filters:
branches:
only:
- master
requires:
- terraform-packet_deploy
- ansible-packer_build:
filters:
branches:
only:
- master
requires:
- ansible-bootstrap
- terraform-packet_destroy:
filters:
branches:
only:
- master
requires:
- ansible-packer_build

Expand Down Expand Up @@ -793,10 +772,6 @@ workflows:
only:
- dev-stage
- packer-linting_vbox:
filters:
branches:
only:
- dev-stage
requires:
- generate-packer-vars
- generate-packer-file
Expand All @@ -808,31 +783,15 @@ workflows:
- python-linting
- ansible-linting
- terraform-packet_deploy:
filters:
branches:
only:
- dev-stage
requires:
- packer-linting_vbox
- ansible-bootstrap:
filters:
branches:
only:
- dev-stage
requires:
- terraform-packet_deploy
- ansible-packer_build:
filters:
branches:
only:
- dev-stage
requires:
- ansible-bootstrap
- terraform-packet_destroy:
filters:
branches:
only:
- dev-stage
requires:
- ansible-packer_build
# TODO: uncomment this
Expand Down
2 changes: 1 addition & 1 deletion scripts/new-kali.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function info_enum() {
packer_var_json_string+="$(printf '"iso_url":"%s",' "${currentKaliISOUrl}")"

printf '\nthe current hash alg chosen: %s\n' "${hashAlgOut}"
packer_var_json_string+="$(printf '"iso_checksum_type":"%s",' "${hashAlgOut}")"
# packer_var_json_string+="$(printf '"iso_checksum_type":"%s",' "${hashAlgOut}")"

currentHashSum=$(grep "${currentKaliISO}" "${tmpDir}/${hashAlg}" | cut -d ' ' -f 1)
printf '\nthe current hash for that file is: %s\n' "${currentHashSum}"
Expand Down
1 change: 0 additions & 1 deletion scripts/template_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ def variable_alterations(packer_template_data: dict, new_vars: dict) -> dict:
'headless': '',
'http_directory': str(new_vars['http_dir']),
'iso_checksum': '',
'iso_checksum_type': '',
'iso_url': '',
'memory': new_vars['build_memory'],
'preseed_path': str(new_vars['preseed_file']),
Expand Down