Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion deploy/galaxy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ resource "google_cloudbuild_trigger" "frontend" {
name = "galaxy"

push {
tag = "^siarnaq-frontend-.*"
tag = var.frontend_trigger_tag_pattern
}
}

Expand Down Expand Up @@ -156,6 +156,8 @@ module "siarnaq" {
storage_public_name = google_storage_bucket.public.name
storage_secure_name = google_storage_bucket.secure.name
storage_ephemeral_name = google_storage_bucket.ephemeral.name

trigger_tag_pattern = var.siarnaq_trigger_tag_pattern
}

module "titan" {
Expand Down
10 changes: 10 additions & 0 deletions deploy/galaxy/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,13 @@ variable "saturn_secrets" {
description = "Secrets to inject into the Saturn secret manager"
type = map
}

variable "siarnaq_trigger_tag_pattern" {
description = "Regex pattern for git tags that trigger Siarnaq backend builds"
type = string
}

variable "frontend_trigger_tag_pattern" {
description = "Regex pattern for git tags that trigger frontend builds"
type = string
}
6 changes: 6 additions & 0 deletions deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ module "production" {
saturn_secrets = var.saturn_secrets_production
storage_releases_name = module.releases.storage_bucket_name

siarnaq_trigger_tag_pattern = "^siarnaq-backend-.*"
frontend_trigger_tag_pattern = "^siarnaq-frontend-.*"

depends_on = [null_resource.apis]
}

Expand Down Expand Up @@ -88,6 +91,9 @@ module "staging" {
saturn_secrets = var.saturn_secrets_staging
storage_releases_name = module.releases.storage_bucket_name

siarnaq_trigger_tag_pattern = "^staging-siarnaq-.*"
frontend_trigger_tag_pattern = "^staging-frontend-.*"

depends_on = [null_resource.apis]
}

Expand Down
2 changes: 1 addition & 1 deletion deploy/siarnaq/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ resource "google_cloudbuild_trigger" "this" {
name = "galaxy"

push {
tag = "^siarnaq-backend-.*"
tag = var.trigger_tag_pattern
}
}

Expand Down
5 changes: 5 additions & 0 deletions deploy/siarnaq/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@ variable "additional_secrets" {
description = "Additional secrets to inject into the secret manager"
type = map
}

variable "trigger_tag_pattern" {
description = "Regex pattern for git tags that trigger builds"
type = string
}
Loading