diff mbox series

[RFC,3/3] aws: Add "m5ad.2xlarge" instance type

Message ID 20241108205040.571326-4-cel@kernel.org (mailing list archive)
State New
Headers show
Series Enable AWS for users in US/Eastern | expand

Checks

Context Check Description
mcgrof/vmtest-main-PR success PR summary
mcgrof/vmtest-main-VM_Test-3 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-4 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-5 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-6 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-8 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-9 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-7 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-10 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-11 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-2 success Logs for Run kdevops CI
mcgrof/vmtest-main-VM_Test-1 success Logs for Run kdevops CI
mcgrof/vmtest-main-VM_Test-0 success Logs for Run kdevops CI

Commit Message

Chuck Lever Nov. 8, 2024, 8:50 p.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

The "m5ad.4xlarge" instance type is almost a dollar an hour these
days. For NFS testing, a smaller instance works just fine.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 kconfigs/workflows/Kconfig.shared | 1 +
 terraform/aws/Kconfig             | 8 ++++++++
 workflows/gitr/btrfs/Kconfig      | 1 +
 workflows/gitr/ext4/Kconfig       | 1 +
 workflows/gitr/xfs/Kconfig        | 1 +
 workflows/sysbench/Kconfig.fs     | 1 +
 6 files changed, 13 insertions(+)
diff mbox series

Patch

diff --git a/kconfigs/workflows/Kconfig.shared b/kconfigs/workflows/Kconfig.shared
index 029eaa4383db..91f86cf77af4 100644
--- a/kconfigs/workflows/Kconfig.shared
+++ b/kconfigs/workflows/Kconfig.shared
@@ -35,6 +35,7 @@  if WORKFLOW_MAKE_CMD_OVERRIDE
 
 config WORKFLOW_MAKE_CMD
 	string "The make command to use when building"
+	default "make -j 8" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "make -j 16" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "make -j 1" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS1_V2
 	default "make -j 4" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS3_V2
diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index a7bf82640ae7..de02f4a3989e 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -280,6 +280,13 @@  choice
 	default TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE if TARGET_ARCH_X86_64
 	default TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM if TARGET_ARCH_ARM64
 
+config TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
+	bool "m5ad.2xlarge"
+	depends on TARGET_ARCH_X86_64
+	help
+	  32 GiB RAM, 8 vcpus, 1 10 GiB main drive, and one additional
+	  300 GiB NVMe drive.
+
 config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	bool "m5ad.4xlarge"
 	depends on TARGET_ARCH_X86_64
@@ -355,6 +362,7 @@  endchoice
 
 config TERRAFORM_AWS_INSTANCE_TYPE
 	string
+	default "m5ad.2xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "m5ad.4xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "is4gen.medium" if TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM
 	default "is4gen.8xlarge" if TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE
diff --git a/workflows/gitr/btrfs/Kconfig b/workflows/gitr/btrfs/Kconfig
index 9498cfbf0286..50e009900b73 100644
--- a/workflows/gitr/btrfs/Kconfig
+++ b/workflows/gitr/btrfs/Kconfig
@@ -3,6 +3,7 @@  config GITR_BTRFS_DEVICE
 	default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 	default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 	default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "/dev/nvme1n1" if TERRAFORM_GCE
 	default "/dev/sdd" if TERRAFORM_AZURE
diff --git a/workflows/gitr/ext4/Kconfig b/workflows/gitr/ext4/Kconfig
index b1320e8686e6..2f8c7ed5e7fb 100644
--- a/workflows/gitr/ext4/Kconfig
+++ b/workflows/gitr/ext4/Kconfig
@@ -3,6 +3,7 @@  config GITR_EXT4_DEVICE
 	default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 	default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 	default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "/dev/nvme1n1" if TERRAFORM_GCE
 	default "/dev/sdd" if TERRAFORM_AZURE
diff --git a/workflows/gitr/xfs/Kconfig b/workflows/gitr/xfs/Kconfig
index 89daafe917ef..851ec13bb8fc 100644
--- a/workflows/gitr/xfs/Kconfig
+++ b/workflows/gitr/xfs/Kconfig
@@ -3,6 +3,7 @@  config GITR_XFS_DEVICE
 	default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 	default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 	default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "/dev/nvme1n1" if TERRAFORM_GCE
 	default "/dev/sdd" if TERRAFORM_AZURE
diff --git a/workflows/sysbench/Kconfig.fs b/workflows/sysbench/Kconfig.fs
index 5a911c68f122..c73c1fddf46b 100644
--- a/workflows/sysbench/Kconfig.fs
+++ b/workflows/sysbench/Kconfig.fs
@@ -177,6 +177,7 @@  config SYSBENCH_DEVICE
 	default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 	default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 	default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "/dev/nvme1n1" if TERRAFORM_GCE
 	default "/dev/sdd" if TERRAFORM_AZURE