From patchwork Fri Nov 8 20:50:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13868966 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70C8017A5BE for ; Fri, 8 Nov 2024 20:50:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099044; cv=none; b=mmj4k19EtC2Myz9ppopFHZapeZ02wL5Lw7Qq6LTUi8nqD3EzSIWSt+VI+kdeXgA/EiMDd2Awr9+hYrPpMn4WyP40wdiom8sZNRzXZ05yqEDyWj2Ron4+mBvdCQwpFzKmg6ArV/eXNGQm35a/ftHAcTorG4ZKLOsfUEJzs/LfSHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099044; c=relaxed/simple; bh=q1xO2Apoxr4IB8+kYoeSr8PdVw1soJycmwrB4FRyM+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tNfbsz39rl2zqkg+GdMLWIXcXa4oH9z+ifIFWt3vv2Un/fPhmdP0d1gO5J/cPzAH0PgqpipMpck7dAjcmdGUHwyUmYYI+dclv6wMeGXfW+No/qZKxncYCUhlh34EMvTzLxfpc9f6cY4dEj4NfpmL1sbeLobNAoJKqRipxNpDD20= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VjccqTCx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VjccqTCx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1F9CC4CED2; Fri, 8 Nov 2024 20:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731099044; bh=q1xO2Apoxr4IB8+kYoeSr8PdVw1soJycmwrB4FRyM+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VjccqTCxYvudxabjk91KQH/wQAOTzekIwGKsS132wksEVgq9h/Y2jYTxTxcGqfb6V qsEJ2/PlYhNRNVRSw5dkmyxGNt/EyhJ2h5Z3ul+PgkjIcZChY2QmT1DrHolSNKMXEi 2GNb+oEZ6rcU3rRP+YIrWz+kPArNbobMRq9jaGb/729nQF8FP051/bGSI8g/Yuj8GV vtpPIW5hNMRqeXFFfVp+ylzy/C/mDpq3Rz7aUdv6hVZL8EaMTbqh6eboqs0/ZM9vnD 10bRitB4vhdPfMYU5iRsJ6RZRwPwGR1WMAFQ20pflEe+h39PUSyt8aflmGnFFGekO9 CMV5DFx7Kxutw== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 1/3] aws: Add support for the us-east availability zone Date: Fri, 8 Nov 2024 15:50:38 -0500 Message-ID: <20241108205040.571326-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108205040.571326-1-cel@kernel.org> References: <20241108205040.571326-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever 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 --- 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 From patchwork Fri Nov 8 20:50:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13868967 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E36AE17A5BE for ; Fri, 8 Nov 2024 20:50:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099045; cv=none; b=jaZrdwBSONbYlS1zH4d+OZhQ6esCF7eT+7CQdHEaQnGH03L/9XXIkWiskrQpccxPzD8h6qamqHKWccb0RbzyB2M1JwTXotDgME7bJW7Z9mBbJmBWsnFR5UhyZ26pyF65Mz72rbuzAgg0YHQ1v0gBy+0kaXgmxzADhuz1RAjDLa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099045; c=relaxed/simple; bh=jDJmj6nTcHQpQt+Oqh2aJVXK+PrMLRXzTBJttLvq7LQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CGk6/NdQI56r9kON8k9UT0gyFBm3+Fihg0g2f2oenPBUGZ1Rgdz+vbrcOsuCXU9Et4H7kN/90380LAlFOuFAk4iRBbYqGlBFCVKCt+8PvPVUlYiga4oGVGnRTfK1KiDjkwI5A25krC4L46CC79ZI8EAbK5jA8i9UonO2ZhFlwco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OjnRBA8H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OjnRBA8H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4ABDBC4CECE; Fri, 8 Nov 2024 20:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731099044; bh=jDJmj6nTcHQpQt+Oqh2aJVXK+PrMLRXzTBJttLvq7LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjnRBA8H+Ka2yD4c5h4E4Moy06ZiR4WR6ZPdBNLT0EpNYRGhowygdVB6H6DyaVyrU KkVtSt7wnlE+gPnRpFx1rKI7bj/qVYK7rP+Yvy28/OqPmDXrVaG2zl0d5fJyclX524 71ZLNlpohwWCdppgTatpnuw6V9umd9vLRwpwpKkE2X21XCip+gQwgBwjOShvpCUCco LlDtYtMzY9HuWMGXdU3WHd8n0Zq7Y6p3FkCc9RF5zthFQuAzSvJRph2UCgPRFjopU9 ZwS9L+bVHorRWHgxwpsOwJ/qBcpgTaEV2v0HGCcUyTw6sJj1GK8a7NsHQ/+Tf+ipJ8 rNHGLVW1bvrvg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 2/3] aws: Update the description of "m5ad.4xlarge" Date: Fri, 8 Nov 2024 15:50:39 -0500 Message-ID: <20241108205040.571326-3-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108205040.571326-1-cel@kernel.org> References: <20241108205040.571326-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever The 4xlarge instance type is bigger and more costly than it used to be. Signed-off-by: Chuck Lever --- 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 From patchwork Fri Nov 8 20:50:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13868968 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AAA417A5BE for ; Fri, 8 Nov 2024 20:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099045; cv=none; b=H4AWSo9b4cSRjFhKXYfsmVRxMyI3zfCHfJ4qyGb5ZBdiaRdOCeyLSyLTg1JPW4RGao7f5Wx+cRP/2Z6vDOPP+iRPsNjCzc2YhKlZ4SyIzGKPgv+3VUu30IG28xtkDGXqOqAMCkHhbiCNj1Ez2wFVb2iAIkrx1I6Cu4w88FgKOMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099045; c=relaxed/simple; bh=D6+ILxTNqK3lEA75iLKrMb3899KIOQNplgZBYFDYMaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jm+MsyFpqOxy8X50iyZ67E+8Mt1PaUb8n4voAwG5itr/WoDOaEu09sIHXWGyJNirYzzAIgg7rM2jvaoZNn0qm9ViXaDs6fyYSNW/sFn1ChkYcXCK3Ura9w/88aCLRBnHAKeX28OOPtQ0KX2NINUcc8YLs1KRio7fE0AYZuHPBMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VWW7kgXE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VWW7kgXE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7AC3C4CED2; Fri, 8 Nov 2024 20:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731099045; bh=D6+ILxTNqK3lEA75iLKrMb3899KIOQNplgZBYFDYMaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VWW7kgXEjo9U5x6oGwwRnFirIb8i8kccd1eUOoFwC7s020Ah6dwlUcwTZWQytE176 J04Nd9NMp5ULPsZFbHqEDvRo49kGbmXX/im1oBe6tCFzf4+bny5Xw/kYN3mxIWl/c2 p2mF9438ZRKLtO6I9gHzxOMtAykZFvtqaosXjIaT6zLvzkTY2PSq/5YFnCC6jlZNfm /hOTJ9Gh+nKN1O5OTddFzSEQTtANDCRxDuNnlWW5R3sQmLpVFs+5maTErUP9zKEsAz 0o4qI+er/r8pFsfro6qtCLeLo2FK7pjr4t6hBpOuUQlxdLpgovFwgNoQwb2gqOLJcF hqdFmg44UY7Hg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type Date: Fri, 8 Nov 2024 15:50:40 -0500 Message-ID: <20241108205040.571326-4-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108205040.571326-1-cel@kernel.org> References: <20241108205040.571326-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever 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 --- 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