From 8a208cc0cff1631e4f294e477f928e02324e9ef7 Mon Sep 17 00:00:00 2001 From: Yang Chiu Date: Fri, 8 Mar 2024 10:15:19 +0800 Subject: [PATCH] Revert "ci: use more cost-effective ec2 instance type" Signed-off-by: Yang Chiu --- .../terraform/aws/ubuntu/variables.tf | 2 +- pipelines/storage_network/terraform/variables.tf | 2 +- scalability_test/terraform/variables.tf | 4 ++-- test_framework/terraform/aws/centos/variables.tf | 4 ++-- test_framework/terraform/aws/eks/main.tf | 2 +- test_framework/terraform/aws/oracle/variables.tf | 8 ++++---- test_framework/terraform/aws/rhel/variables.tf | 8 ++++---- test_framework/terraform/aws/rockylinux/variables.tf | 8 ++++---- test_framework/terraform/aws/sle-micro/variables.tf | 8 ++++---- test_framework/terraform/aws/sles/variables.tf | 8 ++++---- test_framework/terraform/aws/ubuntu/variables.tf | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/build_engine_test_images/terraform/aws/ubuntu/variables.tf b/build_engine_test_images/terraform/aws/ubuntu/variables.tf index c9bd3c38a2..ea651ac36e 100644 --- a/build_engine_test_images/terraform/aws/ubuntu/variables.tf +++ b/build_engine_test_images/terraform/aws/ubuntu/variables.tf @@ -56,7 +56,7 @@ variable "build_engine_aws_instance_name" { variable "build_engine_aws_instance_type" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" default = "" } diff --git a/pipelines/storage_network/terraform/variables.tf b/pipelines/storage_network/terraform/variables.tf index 3d807d04dc..711b276e09 100644 --- a/pipelines/storage_network/terraform/variables.tf +++ b/pipelines/storage_network/terraform/variables.tf @@ -46,7 +46,7 @@ variable "aws_instance_count" { variable "aws_instance_type" { type = string - description = "Recommended instance types t2.xlarge for amd64 & a1.xlarge for arm64" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" default = "t2.xlarge" } diff --git a/scalability_test/terraform/variables.tf b/scalability_test/terraform/variables.tf index 9defd21ea1..388235c0ac 100644 --- a/scalability_test/terraform/variables.tf +++ b/scalability_test/terraform/variables.tf @@ -45,12 +45,12 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - default = "t3.xlarge" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - default = "t3.xlarge" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/centos/variables.tf b/test_framework/terraform/aws/centos/variables.tf index 238748d20c..d9292c2042 100644 --- a/test_framework/terraform/aws/centos/variables.tf +++ b/test_framework/terraform/aws/centos/variables.tf @@ -55,12 +55,12 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/eks/main.tf b/test_framework/terraform/aws/eks/main.tf index 403abe5212..630415219f 100644 --- a/test_framework/terraform/aws/eks/main.tf +++ b/test_framework/terraform/aws/eks/main.tf @@ -120,7 +120,7 @@ resource "aws_eks_node_group" "node_group" { subnet_ids = module.vpc.public_subnets ami_type = var.arch == "amd64" ? "AL2_x86_64" : "AL2_ARM_64" capacity_type = "ON_DEMAND" - instance_types = [var.arch == "amd64" ? "t3.xlarge" : "t4g.xlarge"] + instance_types = [var.arch == "amd64" ? "t2.xlarge" : "a1.2xlarge"] disk_size = 40 scaling_config { desired_size = 3 diff --git a/test_framework/terraform/aws/oracle/variables.tf b/test_framework/terraform/aws/oracle/variables.tf index 48664199cf..3e7cc4dd70 100644 --- a/test_framework/terraform/aws/oracle/variables.tf +++ b/test_framework/terraform/aws/oracle/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/rhel/variables.tf b/test_framework/terraform/aws/rhel/variables.tf index 72ff0a3734..6ef3c39a20 100644 --- a/test_framework/terraform/aws/rhel/variables.tf +++ b/test_framework/terraform/aws/rhel/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/rockylinux/variables.tf b/test_framework/terraform/aws/rockylinux/variables.tf index eb81c3b6f5..cd60eae666 100644 --- a/test_framework/terraform/aws/rockylinux/variables.tf +++ b/test_framework/terraform/aws/rockylinux/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/sle-micro/variables.tf b/test_framework/terraform/aws/sle-micro/variables.tf index 503bbd0cef..7e1f10f5f9 100644 --- a/test_framework/terraform/aws/sle-micro/variables.tf +++ b/test_framework/terraform/aws/sle-micro/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/sles/variables.tf b/test_framework/terraform/aws/sles/variables.tf index 640304259a..64b8bebdf4 100644 --- a/test_framework/terraform/aws/sles/variables.tf +++ b/test_framework/terraform/aws/sles/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" { diff --git a/test_framework/terraform/aws/ubuntu/variables.tf b/test_framework/terraform/aws/ubuntu/variables.tf index 6ee716104f..e63b7afb9c 100644 --- a/test_framework/terraform/aws/ubuntu/variables.tf +++ b/test_framework/terraform/aws/ubuntu/variables.tf @@ -56,14 +56,14 @@ variable "lh_aws_instance_name_controlplane" { variable "lh_aws_instance_type_controlplane" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_type_worker" { type = string - description = "Recommended instance types t3.xlarge for amd64 & t4g.xlarge for arm64" - default = "t3.xlarge" + description = "Recommended instance types t2.xlarge for amd64 & a1.2xlarge for arm64" + default = "t2.xlarge" } variable "lh_aws_instance_root_block_device_size_controlplane" {