feat(terraform): 2n-c7gn

[csit.git] / fdio.infra / packer-aws-sut / ubuntu_jammy_arm.pkr.hcl

diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
index e46814c..f97bd5d 100644 (file)
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
@@ -51,63 +51,23 @@ source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" {
   ami_name        = "csit_ubuntu_jammy_arm_sut"
   ami_description = "CSIT SUT image based on Ubuntu jammy"
   ena_support     = true
-  instance_type   = "c6gn.4xlarge"
+  instance_type   = "c7gn.4xlarge"
   launch_block_device_mappings {
     device_name = "/dev/sda1"
     volume_size = 40
     volume_type = "gp2"
   }
   force_deregister = true
-  region           = "eu-central-1"
+  region           = "eu-west-1"
   skip_create_ami  = false
-  source_ami       = "ami-0329d3839379bfd15"
+  source_ami       = "ami-0a1b36900d715a3ad"
   ssh_username     = "ubuntu"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_arm_tg" {
-  ami_name        = "csit_ubuntu_jammy_arm_tg"
-  ami_description = "CSIT TG image based on Ubuntu jammy"
-  ena_support     = true
-  instance_type   = "c6gn.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-0329d3839379bfd15"
-  ssh_username     = "ubuntu"
-}
-
-#build {
-#  name = "csit_ubuntu_jammy_arm_sut-packer"
-#  sources = [
-#    "source.amazon-ebs.csit_ubuntu_jammy_arm_sut"
-#  ]
-#  provisioner "shell" {
-#    inline = var.first_run_commands
-#  }
-#  provisioner "ansible" {
-#    playbook_file = var.ansible_file_path
-#    user          = "ubuntu"
-#    groups        = ["sut_aws"]
-#    extra_arguments = [
-#      "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}",
-#      "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}",
-#      "--extra-vars", "aws=true"
-#    ]
-#  }
-#  provisioner "shell" {
-#    inline = var.last_run_commands
-#  }
-#}
-
 build {
-  name = "csit_ubuntu_jammy_arm_tg-packer"
+  name = "csit_ubuntu_jammy_arm_sut-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_arm_tg"
+    "source.amazon-ebs.csit_ubuntu_jammy_arm_sut"
   ]
   provisioner "shell" {
     inline = var.first_run_commands
@@ -115,7 +75,7 @@ build {
   provisioner "ansible" {
     playbook_file = var.ansible_file_path
     user          = "ubuntu"
-    groups        = ["tg_aws"]
+    groups        = ["sut_aws"]
     extra_arguments = [
       "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}",
       "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}",
@@ -125,4 +85,4 @@ build {
   provisioner "shell" {
     inline = var.last_run_commands
   }
-}
+}
\ No newline at end of file