From 479e40b202e174cc00577ec745d3018056da87b6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 27 Oct 2021 11:06:13 +0300 Subject: [PATCH] Remove default values from Anka packer template (#4346) --- images/macos/templates/macOS-11.pkr.hcl | 85 ++++++++++++++----------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 6b8c8404..7cc739a8 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -1,26 +1,43 @@ variable "source_vm_name" { - type = string - default = "clean_macos_11_300gb" + type = string } variable "source_vm_tag" { type = string - default = "bigsur_300gb" } -variable "vm_name" { +variable "build_id" { type = string - default = "macos-11" +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "xcode_install_user" { + type = string + sensitive = true +} + +variable "xcode_install_password" { + type = string + sensitive = true } variable "vcpu_count" { type = string - default = "4" + default = "5" } variable "ram_size" { type = string - default = "6G" + default = "12G" } variable "image_os" { @@ -28,23 +45,17 @@ variable "image_os" { default = "macos11" } -variable "build_id" { type = string } -variable "vm_username" { type = string } -variable "vm_password" { type = string } -variable "xcode_install_user" { type = string } -variable "xcode_install_password" { type = string } - source "veertu-anka-vm-clone" "template" { - vm_name = "${var.vm_name}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" source_vm_tag = "${var.source_vm_tag}" vcpu_count = "${var.vcpu_count}" ram_size = "${var.ram_size}" - stop_vm = "true" + stop_vm = "true" } -build { - sources = [ +build { + sources = [ "source.veertu-anka-vm-clone.template", ] provisioner "shell" { @@ -54,23 +65,23 @@ build { } provisioner "file" { destination = "image-generation/" - sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] + sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./provision/configuration/environment/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" + source = "./provision/configuration/environment/bashprofile" } provisioner "file" { destination = "./" - source = "./provision/utils" + source = "./provision/utils" } provisioner "shell" { inline = [ @@ -79,11 +90,11 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./provision/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" - source = "./toolsets/toolset-11.json" + source = "./toolsets/toolset-11.json" } provisioner "shell" { scripts = [ @@ -100,7 +111,7 @@ build { "PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ @@ -113,11 +124,11 @@ build { "IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { @@ -134,7 +145,7 @@ build { "./provision/core/git.sh", "./provision/core/node.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/xcode.ps1" @@ -142,11 +153,11 @@ build { "XCODE_INSTALL_USER=${var.xcode_install_user}", "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { @@ -181,33 +192,33 @@ build { "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/toolset.ps1" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { script = "./provision/core/delete-duplicate-sims.rb" - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName UUID=${build.PackerRunUUID}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "file" { destination = "../image-output/" direction = "download" - source = "./image-generation/output/" + source = "./image-generation/output/" } provisioner "shell" { scripts = [ "./provision/configuration/configure-hostname.sh", "./provision/configuration/finalize-vm.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } -} \ No newline at end of file +}