Always build on on-demand instances

Author: crohr

patches/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl

@@ -96,8 +96,9 @@ source "amazon-ebs" "build_ebs" {
   # make AMIs publicly accessible
   ami_groups                                = ["all"]
   ebs_optimized                             = true
-  spot_instance_types                       = ["r7g.large", "c7g.xlarge", "m7g.xlarge", "c7g.2xlarge", "m7g.2xlarge"]
-  spot_price                                = "1.00"
+  # spot_instance_types                       = ["r7g.large", "c7g.xlarge", "m7g.xlarge", "c7g.2xlarge", "m7g.2xlarge"]
+  # spot_price                                = "1.00"
+  instance_type                             = "m8g.large"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"

patches/ubuntu/templates/ubuntu22-full-x64.pkr.hcl

@@ -108,7 +108,7 @@ source "amazon-ebs" "build_ebs" {
   ebs_optimized                             = true
   # spot_instance_types                       = ["r7a.large", "r7i.large", "m7a.xlarge", "c7a.xlarge", "c7i.xlarge", "m7i.xlarge", "m7i-flex.xlarge"]
   # spot_price                                = "auto"
-  instance_type                             = "m7a.large"
+  instance_type                             = "m8a.large"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"

patches/ubuntu/templates/ubuntu22-gpu-x64.pkr.hcl

@@ -88,9 +88,9 @@ source "amazon-ebs" "build_ebs" {
   # make AMIs publicly accessible
   ami_groups                                = ["all"]
   ebs_optimized                             = true
-  # spot_instance_types                       = ["m7a.xlarge", "c7a.xlarge", "c7i.xlarge", "m7i.xlarge", "m7i-flex.xlarge"]
-  spot_instance_types                       = ["g4dn.xlarge", "g5.xlarge", "g6.xlarge", "g6e.xlarge"]
-  spot_price                                = "auto"
+  # spot_instance_types                       = ["g4dn.xlarge", "g5.xlarge", "g6.xlarge", "g6e.xlarge"]
+  # spot_price                                = "auto"
+  instance_type                             = "g4dn.xlarge"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"

patches/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl

@@ -106,8 +106,9 @@ source "amazon-ebs" "build_ebs" {
   # make AMIs publicly accessible
   ami_groups                                = ["all"]
   ebs_optimized                             = true
-  spot_instance_types                       = ["r7g.large", "m7g.xlarge", "c7g.xlarge"]
-  spot_price                                = "1.00"
+  # spot_instance_types                       = ["r7g.large", "m7g.xlarge", "c7g.xlarge"]
+  # spot_price                                = "1.00"
+  instance_type                             = "m8g.large"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"

patches/ubuntu/templates/ubuntu24-full-x64.pkr.hcl

@@ -106,8 +106,9 @@ source "amazon-ebs" "build_ebs" {
   # make AMIs publicly accessible
   ami_groups                                = ["all"]
   ebs_optimized                             = true
-  spot_instance_types                       = ["r7a.large", "r7i.large", "m7a.xlarge", "c7a.xlarge", "m7i-flex.xlarge"]
-  spot_price                                = "1.00"
+  # spot_instance_types                       = ["r7a.large", "r7i.large", "m7a.xlarge", "c7a.xlarge", "m7i-flex.xlarge"]
+  # spot_price                                = "1.00"
+  instance_type                             = "m8a.large"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"

patches/ubuntu/templates/ubuntu24-gpu-x64.pkr.hcl

@@ -82,8 +82,9 @@ source "amazon-ebs" "build_ebs" {
   # make AMIs publicly accessible
   ami_groups                                = ["all"]
   ebs_optimized                             = true
-  spot_instance_types                       = ["g4dn.xlarge", "g5.xlarge", "g6.xlarge", "g6e.xlarge"]
-  spot_price                                = "auto"
+  # spot_instance_types                       = ["g4dn.xlarge", "g5.xlarge", "g6.xlarge", "g6e.xlarge"]
+  # spot_price                                = "auto"
+  instance_type                             = "g4dn.xlarge"
   region                                    = "${var.region}"
   ssh_username                              = "ubuntu"
   subnet_id                                 = "${var.subnet_id}"