[CI] Update premerge buildbot deployments

We added more buildbots and renamed the existing ones, so update the TF to
reflect this.

Author: boomanaiden154

premerge/main.tf

@@ -171,9 +171,9 @@ module "premerge_cluster_us_central_resources" {
   linux_object_cache_gcp_service_account_email             = module.premerge_cluster_us_central.linux_object_cache_gcp_service_account_email
   windows_2022_object_cache_gcp_service_account_email      = module.premerge_cluster_us_central.windows_2022_object_cache_gcp_service_account_email
   github_arc_version                                       = "0.12.1"
-  linux_buildbot_name                                      = "premerge-us-central-linux-b1"
+  linux_buildbot_name_template                             = "premerge-us-central-linux"
   linux_buildbot_password                                  = data.google_secret_manager_secret_version.us_central_linux_buildbot_password.secret_data
-  windows_buildbot_name                                    = "premerge-us-central-windows-b1"
+  windows_buildbot_name_template                           = "premerge-us-central-windows"
   windows_buildbot_password                                = data.google_secret_manager_secret_version.us_central_windows_buildbot_password.secret_data
   linux_object_cache_buildbot_service_account_email        = module.premerge_cluster_us_central.linux_object_cache_buildbot_service_account_email
   windows_2022_object_cache_buildbot_service_account_email = module.premerge_cluster_us_central.windows_2022_object_cache_buildbot_service_account_email
@@ -198,9 +198,9 @@ module "premerge_cluster_us_west_resources" {
   linux_object_cache_gcp_service_account_email             = module.premerge_cluster_us_west.linux_object_cache_gcp_service_account_email
   windows_2022_object_cache_gcp_service_account_email      = module.premerge_cluster_us_west.windows_2022_object_cache_gcp_service_account_email
   github_arc_version                                       = "0.12.1"
-  linux_buildbot_name                                      = "premerge-us-west-linux-b1"
+  linux_buildbot_name_template                             = "premerge-us-west-linux"
   linux_buildbot_password                                  = data.google_secret_manager_secret_version.us_west_linux_buildbot_password.secret_data
-  windows_buildbot_name                                    = "premerge-us-west-windows-b1"
+  windows_buildbot_name_template                           = "premerge-us-west-windows"
   windows_buildbot_password                                = data.google_secret_manager_secret_version.us_west_windows_buildbot_password.secret_data
   linux_object_cache_buildbot_service_account_email        = module.premerge_cluster_us_west.linux_object_cache_buildbot_service_account_email
   windows_2022_object_cache_buildbot_service_account_email = module.premerge_cluster_us_west.windows_2022_object_cache_buildbot_service_account_email

premerge/premerge_resources/main.tf

@@ -341,8 +341,20 @@ resource "kubernetes_service_account" "linux_buildbot_gcs_ksa" {
   depends_on = [kubernetes_namespace.llvm_premerge_linux_buildbot]
 }
 
-resource "kubernetes_manifest" "linux_buildbot_deployment" {
-  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : var.linux_buildbot_name, buildbot_namespace : "llvm-premerge-linux-buildbot", secret_name : "linux-buildbot-password", buildbot_region : var.cluster_name }))
+resource "kubernetes_manifest" "linux_buildbot_b1_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b1", var.linux_buildbot_name_template), buildbot_namespace : "llvm-premerge-linux-buildbot", secret_name : "linux-buildbot-password", buildbot_region : var.cluster_name }))
+
+  depends_on = [kubernetes_namespace.llvm_premerge_linux_buildbot, kubernetes_secret.linux_buildbot_password]
+}
+
+resource "kubernetes_manifest" "linux_buildbot_b2_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b2", var.linux_buildbot_name_template), buildbot_namespace : "llvm-premerge-linux-buildbot", secret_name : "linux-buildbot-password", buildbot_region : var.cluster_name }))
+
+  depends_on = [kubernetes_namespace.llvm_premerge_linux_buildbot, kubernetes_secret.linux_buildbot_password]
+}
+
+resource "kubernetes_manifest" "linux_buildbot_b3_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b3", var.linux_buildbot_name_template), buildbot_namespace : "llvm-premerge-linux-buildbot", secret_name : "linux-buildbot-password", buildbot_region : var.cluster_name }))
 
   depends_on = [kubernetes_namespace.llvm_premerge_linux_buildbot, kubernetes_secret.linux_buildbot_password]
 }
@@ -404,8 +416,20 @@ resource "kubernetes_service_account" "windows_2022_buildbot_gcs_ksa" {
   depends_on = [kubernetes_namespace.llvm_premerge_windows_2022_buildbot]
 }
 
-resource "kubernetes_manifest" "windows_buildbot_deployment" {
-  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : var.windows_buildbot_name, buildbot_namespace : "llvm-premerge-windows-2022-buildbot", secret_name : "windows-buildbot-password", buildbot_region : var.cluster_name }))
+resource "kubernetes_manifest" "windows_buildbot_b1_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b1", var.windows_buildbot_name_template), buildbot_namespace : "llvm-premerge-windows-2022-buildbot", secret_name : "windows-buildbot-password", buildbot_region : var.cluster_name }))
+
+  depends_on = [kubernetes_namespace.llvm_premerge_windows_2022_buildbot, kubernetes_secret.windows_2022_buildbot_password]
+}
+
+resource "kubernetes_manifest" "windows_buildbot_b2_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b2", var.windows_buildbot_name_template), buildbot_namespace : "llvm-premerge-windows-2022-buildbot", secret_name : "windows-buildbot-password", buildbot_region : var.cluster_name }))
+
+  depends_on = [kubernetes_namespace.llvm_premerge_windows_2022_buildbot, kubernetes_secret.windows_2022_buildbot_password]
+}
+
+resource "kubernetes_manifest" "windows_buildbot_b3_deployment" {
+  manifest = yamldecode(templatefile("buildbot_deployment.yaml", { buildbot_name : format("%s-b3", var.windows_buildbot_name_template), buildbot_namespace : "llvm-premerge-windows-2022-buildbot", secret_name : "windows-buildbot-password", buildbot_region : var.cluster_name }))
 
   depends_on = [kubernetes_namespace.llvm_premerge_windows_2022_buildbot, kubernetes_secret.windows_2022_buildbot_password]
 }

premerge/premerge_resources/variables.tf

@@ -104,7 +104,7 @@ variable "windows_2022_object_cache_gcp_service_account_email" {
   type        = string
 }
 
-variable "linux_buildbot_name" {
+variable "linux_buildbot_name_template" {
   description = "The name of the linux buildbot that will run tests postcommit."
   type        = string
 }
@@ -114,7 +114,7 @@ variable "linux_buildbot_password" {
   type        = string
 }
 
-variable "windows_buildbot_name" {
+variable "windows_buildbot_name_template" {
   description = "The name of the windows buildbot that will run tests postcommit."
   type        = string
 }