aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2023-07-14 12:56:06 +0000
committerpmikus <peter.mikus@protonmail.ch>2023-07-14 12:56:06 +0000
commitf04617b817436dd45eca973c24455fb9c147b3f2 (patch)
tree6f849848077646899db1682a33944846410c259a /fdio.infra
parent6cfd831b241b9711c8573364c9e59d0e9ec2cdad (diff)
fix(packer): Naming
Signed-off-by: pmikus <peter.mikus@protonmail.ch> Change-Id: I8127beeb6664aa51ef5cb313d658ab2e5638b581
Diffstat (limited to 'fdio.infra')
-rw-r--r--fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl60
-rw-r--r--fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl16
2 files changed, 38 insertions, 38 deletions
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 6e612f1fc4..e46814c1c5 100644
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
@@ -47,8 +47,8 @@ variable "ansible_provision_pwd" {
default = "Csit1234"
}
-source "amazon-ebs" "csit_c6gn_ubuntu_jammy_sut" {
- ami_name = "csit_c6gn_ubuntu_jammy_sut"
+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"
@@ -60,12 +60,12 @@ source "amazon-ebs" "csit_c6gn_ubuntu_jammy_sut" {
force_deregister = true
region = "eu-central-1"
skip_create_ami = false
- source_ami = "ami-0a875db8a031a9efb"
+ source_ami = "ami-0329d3839379bfd15"
ssh_username = "ubuntu"
}
-source "amazon-ebs" "csit_c6gn_ubuntu_jammy_tg" {
- ami_name = "csit_c6gn_ubuntu_jammy_tg"
+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"
@@ -77,37 +77,37 @@ source "amazon-ebs" "csit_c6gn_ubuntu_jammy_tg" {
force_deregister = true
region = "eu-central-1"
skip_create_ami = false
- source_ami = "ami-0a875db8a031a9efb"
+ source_ami = "ami-0329d3839379bfd15"
ssh_username = "ubuntu"
}
-build {
- name = "csit_c6gn_ubuntu_jammy_sut-packer"
- sources = [
- "source.amazon-ebs.csit_c6gn_ubuntu_jammy_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_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_c6gn_ubuntu_jammy_tg-packer"
+ name = "csit_ubuntu_jammy_arm_tg-packer"
sources = [
- "source.amazon-ebs.csit_c6gn_ubuntu_jammy_tg"
+ "source.amazon-ebs.csit_ubuntu_jammy_arm_tg"
]
provisioner "shell" {
inline = var.first_run_commands
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 376e1c324f..7293d176e0 100644
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
@@ -47,8 +47,8 @@ variable "ansible_provision_pwd" {
default = "Csit1234"
}
-source "amazon-ebs" "csit_c5n_ubuntu_jammy_sut" {
- ami_name = "csit_c5n_ubuntu_jammy_sut"
+source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
+ ami_name = "csit_ubuntu_jammy_x86_sut"
ami_description = "CSIT SUT image based on Ubuntu Jammy"
ena_support = true
instance_type = "c5n.4xlarge"
@@ -64,8 +64,8 @@ source "amazon-ebs" "csit_c5n_ubuntu_jammy_sut" {
ssh_username = "ubuntu"
}
-source "amazon-ebs" "csit_c5n_ubuntu_jammy_tg" {
- ami_name = "csit_c5n_ubuntu_jammy_tg"
+source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
+ ami_name = "csit_ubuntu_jammy_x86_tg"
ami_description = "CSIT TG image based on Ubuntu Jammy"
ena_support = true
instance_type = "c5n.4xlarge"
@@ -82,9 +82,9 @@ source "amazon-ebs" "csit_c5n_ubuntu_jammy_tg" {
}
build {
- name = "csit_c5n_ubuntu_jammy_sut-packer"
+ name = "csit_ubuntu_jammy_x86_sut-packer"
sources = [
- "source.amazon-ebs.csit_c5n_ubuntu_jammy_sut"
+ "source.amazon-ebs.csit_ubuntu_jammy_x86_sut"
]
provisioner "shell" {
inline = var.first_run_commands
@@ -105,9 +105,9 @@ build {
}
build {
- name = "csit_c5n_ubuntu_jammy_tg-packer"
+ name = "csit_ubuntu_jammy_x86_tg-packer"
sources = [
- "source.amazon-ebs.csit_c5n_ubuntu_jammy_tg"
+ "source.amazon-ebs.csit_ubuntu_jammy_x86_tg"
]
provisioner "shell" {
inline = var.first_run_commands