From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type
Date: Fri, 8 Nov 2024 15:50:40 -0500 [thread overview]
Message-ID: <20241108205040.571326-4-cel@kernel.org> (raw)
In-Reply-To: <20241108205040.571326-1-cel@kernel.org>
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 --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
--
2.47.0
next prev parent reply other threads:[~2024-11-08 20:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 20:50 [RFC PATCH 0/3] Enable AWS for users in US/Eastern cel
2024-11-08 20:50 ` [RFC PATCH 1/3] aws: Add support for the us-east availability zone cel
2024-11-08 20:50 ` [RFC PATCH 2/3] aws: Update the description of "m5ad.4xlarge" cel
2024-11-08 20:50 ` cel [this message]
2024-11-09 0:02 ` [RFC PATCH 0/3] Enable AWS for users in US/Eastern Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241108205040.571326-4-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.