diff --git a/.circleci/config.yml b/.circleci/config.yml index 25b3bf7..d386d72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: @@ -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 @@ -699,10 +698,6 @@ workflows: only: - master - packer-linting_vbox: - filters: - branches: - only: - - master requires: - generate-packer-vars - generate-packer-file @@ -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 @@ -793,10 +772,6 @@ workflows: only: - dev-stage - packer-linting_vbox: - filters: - branches: - only: - - dev-stage requires: - generate-packer-vars - generate-packer-file @@ -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 diff --git a/scripts/new-kali.sh b/scripts/new-kali.sh index 63e1310..bd9068b 100755 --- a/scripts/new-kali.sh +++ b/scripts/new-kali.sh @@ -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}" diff --git a/scripts/template_gen.py b/scripts/template_gen.py index 0c6ab84..8262d38 100755 --- a/scripts/template_gen.py +++ b/scripts/template_gen.py @@ -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']),