* [RFC PATCH 1/3] aws: Add support for the us-east availability zone
2024-11-08 20:50 [RFC PATCH 0/3] Enable AWS for users in US/Eastern cel
@ 2024-11-08 20:50 ` cel
2024-11-08 20:50 ` [RFC PATCH 2/3] aws: Update the description of "m5ad.4xlarge" cel
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: cel @ 2024-11-08 20:50 UTC (permalink / raw)
To: kdevops; +Cc: Chuck Lever
From: Chuck Lever <chuck.lever@oracle.com>
AWS steers my instances into us_east-1 or us_east-2, as I am in the
US/Eastern time zone.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
terraform/aws/Kconfig | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index a94045afcfee..7c134e957f6e 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -4,6 +4,11 @@ choice
prompt "AWS region to use"
default TERRAFORM_AWS_US_WEST_2
+config TERRAFORM_AWS_US_EAST_1
+ bool "us-east-1 - N. Virginia"
+ help
+ This option will set the AWS region to us-east-1.
+
config TERRAFORM_AWS_US_WEST_1
bool "us-west-1 - North California"
help
@@ -54,6 +59,7 @@ config TERRAFORM_AWS_REGION
string
default "us-west-2" if TERRAFORM_AWS_US_WEST_2
default "us-west-1" if TERRAFORM_AWS_US_WEST_1
+ default "us-east-1" if TERRAFORM_AWS_US_EAST_1
if TERRAFORM_AWS_US_WEST_2
@@ -93,6 +99,7 @@ config TERRAFORM_AWS_AV_REGION
default "us-west-1b" if TERRAFORM_AWS_AV_REGION_WEST_1B
default "us-west-2b" if TERRAFORM_AWS_AV_REGION_WEST_2B
default "us-west-2d" if TERRAFORM_AWS_AV_REGION_WEST_2D
+ default "us-east-1a" if TERRAFORM_AWS_US_EAST_1
choice
prompt "AWS AMI owner"
@@ -123,6 +130,12 @@ config TERRAFORM_AWS_RHEL9_X86_64
help
This option will set AWS AMI owner to RHEL9 for x86_64.
+config TERRAFORM_AWS_RHEL9_X86_64_EAST
+ bool "RHEL9 x86_64 - ami-0de7e7cc68b747751"
+ depends on TARGET_ARCH_X86_64 && TERRAFORM_AWS_US_EAST_1
+ help
+ This option will set AWS AMI owner to RHEL9 for x86_64.
+
config TERRAFORM_AWS_RHEL9_ARM64
bool "RHEL9 x86_64 - ami-08911268ee09cb08e"
depends on TARGET_ARCH_ARM64 && TERRAFORM_AWS_US_WEST_2
@@ -209,7 +222,7 @@ config TERRAFORM_AWS_AMI_OWNER
string
default TERRAFORM_AWS_AMI_DEBIAN_OWNER if TERRAFORM_AWS_AMI_DEBIAN
default "137112412989" if TERRAFORM_AWS_AMI_AMAZON_X86_64 || TERRAFORM_AWS_AMI_AMAZON_ARM64
- default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64
+ default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64 || TERRAFORM_AWS_RHEL9_X86_64_EAST
default "013907871322" if TERRAFORM_AWS_SLE15_SP4_X86_64 || TERRAFORM_AWS_SLE15_SP4_ARM64
help
This option will set AWS AMI owner.
@@ -225,6 +238,7 @@ config TERRAFORM_AWS_NS
default "al2023-*-x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_AMI_AMAZON_X86_64
default "al2023-*-arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_AMI_AMAZON_ARM64
default "RHEL-9.*x86_64-*" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_RHEL9_X86_64
+ default "RHEL-9.*x86_64-*" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_RHEL9_X86_64_EAST
default "RHEL-9.*arm64-*" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_RHEL9_ARM64
default "suse-sles-15-sp4-*x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_SLE15_SP4_X86_64
default "suse-sles-15-sp4-*arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_SLE15_SP4_ARM64
--
2.47.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [RFC PATCH 2/3] aws: Update the description of "m5ad.4xlarge"
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 ` cel
2024-11-08 20:50 ` [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type cel
2024-11-09 0:02 ` [RFC PATCH 0/3] Enable AWS for users in US/Eastern Luis Chamberlain
3 siblings, 0 replies; 5+ messages in thread
From: cel @ 2024-11-08 20:50 UTC (permalink / raw)
To: kdevops; +Cc: Chuck Lever
From: Chuck Lever <chuck.lever@oracle.com>
The 4xlarge instance type is bigger and more costly than it used to
be.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
terraform/aws/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index 7c134e957f6e..a7bf82640ae7 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -281,10 +281,10 @@ choice
default TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM if TARGET_ARCH_ARM64
config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
- bool "m5ad.4xlarge - $0.824 per Hour"
+ bool "m5ad.4xlarge"
depends on TARGET_ARCH_X86_64
help
- 61 GiB RAM, 16 vcpus, 1 8 GiB main drive, and two additional
+ 64 GiB RAM, 16 vcpus, 1 10 GiB main drive, and two additional
300 GiB NVMe drives.
config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM
--
2.47.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type
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
2024-11-09 0:02 ` [RFC PATCH 0/3] Enable AWS for users in US/Eastern Luis Chamberlain
3 siblings, 0 replies; 5+ messages in thread
From: cel @ 2024-11-08 20:50 UTC (permalink / raw)
To: kdevops; +Cc: Chuck Lever
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RFC PATCH 0/3] Enable AWS for users in US/Eastern
2024-11-08 20:50 [RFC PATCH 0/3] Enable AWS for users in US/Eastern cel
` (2 preceding siblings ...)
2024-11-08 20:50 ` [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type cel
@ 2024-11-09 0:02 ` Luis Chamberlain
3 siblings, 0 replies; 5+ messages in thread
From: Luis Chamberlain @ 2024-11-09 0:02 UTC (permalink / raw)
To: cel; +Cc: kdevops, Chuck Lever
On Fri, Nov 08, 2024 at 03:50:37PM -0500, cel@kernel.org wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
>
> Some minor kdevops Kconfig option changes to make AWS work for me.
> Some workflow-specific changes are coming later.
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Luis
^ permalink raw reply [flat|nested] 5+ messages in thread