GHA runners - Separate AMI owner filters for linux and windows instan…

…ces (#951)
pytorch · Oct 25, 2022 · f524390 · f524390
1 parent e6c764f
commit f524390
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/terraform-aws-github-runner/main.tf b/terraform-aws-github-runner/main.tf
@@ -83,7 +83,8 @@ module "runners" {
   block_device_mappings = var.block_device_mappings
 
   runner_architecture = local.runner_architecture
-  ami_owners          = var.ami_owners
+  ami_owners_linux    = var.ami_owners_linux
+  ami_owners_windows  = var.ami_owners_windows
   ami_filter_linux    = var.ami_filter_linux
   ami_filter_windows  = var.ami_filter_windows
 

diff --git a/terraform-aws-github-runner/modules/download-lambda/outputs.tf b/terraform-aws-github-runner/modules/download-lambda/outputs.tf
@@ -1,3 +1,3 @@
 output "files" {
-  value = null_resource.download.*.triggers.file
+  value = null_resource.download[*].triggers.file
 }
diff --git a/terraform-aws-github-runner/modules/runners/main.tf b/terraform-aws-github-runner/modules/runners/main.tf
@@ -39,7 +39,7 @@ data "aws_ami" "runner_ami_linux" {
     }
   }
 
-  owners = var.ami_owners
+  owners = var.ami_owners_linux
 }
 
 data "aws_ami" "runner_ami_windows" {
@@ -53,7 +53,7 @@ data "aws_ami" "runner_ami_windows" {
     }
   }
 
-  owners = var.ami_owners
+  owners = var.ami_owners_windows
 }
 
 resource "aws_launch_template" "linux_runner" {

diff --git a/terraform-aws-github-runner/modules/runners/variables.tf b/terraform-aws-github-runner/modules/runners/variables.tf
@@ -92,8 +92,14 @@ variable "ami_filter_windows" {
   }
 }
 
-variable "ami_owners" {
-  description = "The list of owners used to select the AMI of action runner instances."
+variable "ami_owners_linux" {
+  description = "The list of owners used to select the AMI of linux action runner instances."
+  type        = list(string)
+  default     = ["amazon"]
+}
+
+variable "ami_owners_windows" {
+  description = "The list of owners used to select the AMI of windows action runner instances."
   type        = list(string)
   default     = ["amazon"]
 }

diff --git a/terraform-aws-github-runner/variables.tf b/terraform-aws-github-runner/variables.tf
@@ -217,8 +217,14 @@ variable "ami_filter_windows" {
   }
 }
 
-variable "ami_owners" {
-  description = "The list of owners used to select the AMI of action runner instances."
+variable "ami_owners_linux" {
+  description = "The list of owners used to select the AMI of linux action runner instances."
+  type        = list(string)
+  default     = ["amazon"]
+}
+
+variable "ami_owners_windows" {
+  description = "The list of owners used to select the AMI of windows action runner instances."
   type        = list(string)
   default     = ["amazon"]
 }