diff options
author | Peter Mikus <peter.mikus@protonmail.ch> | 2024-12-04 09:12:26 +0100 |
---|---|---|
committer | Peter Mikus <peter.mikus@protonmail.ch> | 2024-12-04 08:41:00 +0000 |
commit | 0ebc52457569ad77cfa5b1c322d0d28baeea9777 (patch) | |
tree | efcc12f17f73f0b3aed49e8406cee4a36e59ef9d /fdio.infra | |
parent | a1ea383338757c934c5f329bf6265623a52008d0 (diff) |
feat(infra): AWS -> Noble
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I95f2945597eeacb01e04ae0b40dc2bba667dcf91
Diffstat (limited to 'fdio.infra')
-rw-r--r-- | fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl | 2 | ||||
-rw-r--r-- | fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl (renamed from fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl) | 80 |
2 files changed, 41 insertions, 41 deletions
diff --git a/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl index 58507ff155..1d3c78ee14 100644 --- a/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl +++ b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl @@ -60,7 +60,7 @@ source "amazon-ebs" "csit_ubuntu_noble_arm_sut" { force_deregister = true region = "eu-west-1" skip_create_ami = false - source_ami = "ami-0a1b36900d715a3ad" + source_ami = "ami-099a546c02844706e" ssh_username = "ubuntu" } diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl index 3a2c1ff6e8..5eddfe7687 100644 --- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl +++ b/fdio.infra/packer-aws-sut/ubuntu_noble_x86.pkr.hcl @@ -47,28 +47,28 @@ variable "ansible_provision_pwd" { default = "Csit1234" } -source "amazon-ebs" "csit_ubuntu_noble_x86_sut" { - ami_name = "csit_ubuntu_noble_x86_sut" - ami_description = "CSIT SUT image based on Ubuntu noble" - ena_support = true - instance_type = "c6in.4xlarge" - launch_block_device_mappings { - device_name = "/dev/sda1" - volume_size = 40 - volume_type = "gp2" - } - force_deregister = true - region = "eu-central-1" - skip_create_ami = false - source_ami = "ami-026c3177c9bd54288" - ssh_username = "ubuntu" -} +#source "amazon-ebs" "csit_ubuntu_noble_x86_sut" { +# ami_name = "csit_ubuntu_noble_x86_sut" +# ami_description = "CSIT SUT image based on Ubuntu noble" +# ena_support = true +# instance_type = "c5n.4xlarge" +# launch_block_device_mappings { +# device_name = "/dev/sda1" +# volume_size = 40 +# volume_type = "gp2" +# } +# force_deregister = true +# region = "eu-central-1" +# skip_create_ami = false +# source_ami = "ami-0084a47cc718c111a" +# ssh_username = "ubuntu" +#} source "amazon-ebs" "csit_ubuntu_noble_x86_tg" { ami_name = "csit_ubuntu_noble_x86_tg" ami_description = "CSIT TG image based on Ubuntu noble" ena_support = true - instance_type = "c6in.4xlarge" + instance_type = "c5n.4xlarge" launch_block_device_mappings { device_name = "/dev/sda1" volume_size = 40 @@ -77,32 +77,32 @@ source "amazon-ebs" "csit_ubuntu_noble_x86_tg" { force_deregister = true region = "eu-central-1" skip_create_ami = false - source_ami = "ami-026c3177c9bd54288" + source_ami = "ami-0084a47cc718c111a" ssh_username = "ubuntu" } -build { - name = "csit_ubuntu_noble_x86_sut-packer" - sources = [ - "source.amazon-ebs.csit_ubuntu_noble_x86_sut" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - use_proxy = false - groups = ["sut_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} +#build { +# name = "csit_ubuntu_noble_x86_sut-packer" +# sources = [ +# "source.amazon-ebs.csit_ubuntu_noble_x86_sut" +# ] +# provisioner "shell" { +# inline = var.first_run_commands +# } +# provisioner "ansible" { +# playbook_file = var.ansible_file_path +# user = "ubuntu" +# use_proxy = false +# groups = ["sut_aws"] +# extra_arguments = [ +# "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", +# "--extra-vars", "aws=true" +# ] +# } +# provisioner "shell" { +# inline = var.last_run_commands +# } +#} build { name = "csit_ubuntu_noble_x86_tg-packer" |