fix(infra): Few fixes

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: If7b85d7cf08b036f9d3676902db583c1aee7ce1c

3 files changed, 16 insertions, 15 deletions

diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
index 625a3a1ea7..3a2c1ff6e8 100644
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
@@ -47,9 +47,9 @@ variable "ansible_provision_pwd" {
   default     = "Csit1234"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
-  ami_name        = "csit_ubuntu_jammy_x86_sut"
-  ami_description = "CSIT SUT image based on Ubuntu Jammy"
+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 {
@@ -64,9 +64,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
   ssh_username     = "ubuntu"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
-  ami_name        = "csit_ubuntu_jammy_x86_tg"
-  ami_description = "CSIT TG image based on Ubuntu Jammy"
+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"
   launch_block_device_mappings {
@@ -82,9 +82,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
 }
 
 build {
-  name = "csit_ubuntu_jammy_x86_sut-packer"
+  name = "csit_ubuntu_noble_x86_sut-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_x86_sut"
+    "source.amazon-ebs.csit_ubuntu_noble_x86_sut"
   ]
   provisioner "shell" {
     inline = var.first_run_commands
@@ -105,9 +105,9 @@ build {
 }
 
 build {
-  name = "csit_ubuntu_jammy_x86_tg-packer"
+  name = "csit_ubuntu_noble_x86_tg-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_x86_tg"
+    "source.amazon-ebs.csit_ubuntu_noble_x86_tg"
   ]
   provisioner "shell" {
     inline = var.first_run_commands
diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl
index f97bd5d01b..58507ff155 100644
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl
@@ -47,9 +47,9 @@ variable "ansible_provision_pwd" {
   default     = "Csit1234"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" {
-  ami_name        = "csit_ubuntu_jammy_arm_sut"
-  ami_description = "CSIT SUT image based on Ubuntu jammy"
+source "amazon-ebs" "csit_ubuntu_noble_arm_sut" {
+  ami_name        = "csit_ubuntu_noble_arm_sut"
+  ami_description = "CSIT SUT image based on Ubuntu noble"
   ena_support     = true
   instance_type   = "c7gn.4xlarge"
   launch_block_device_mappings {
@@ -65,9 +65,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" {
 }
 
 build {
-  name = "csit_ubuntu_jammy_arm_sut-packer"
+  name = "csit_ubuntu_noble_arm_sut-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_arm_sut"
+    "source.amazon-ebs.csit_ubuntu_noble_arm_sut"
   ]
   provisioner "shell" {
     inline = var.first_run_commands
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
index 51d3a172d6..2e8f6b1329 100644
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
@@ -84,6 +84,7 @@ autoinstall:
     layout: us
     toggle: null
     variant: ''
+  late-commands:
     - curtin in-target --target=/target -- systemctl enable docker
   locale: en_US.UTF-8
   network: