Skip to content

Commit 2528694

Browse files
committed
adding separate build triggers for staging
1 parent 2e857d7 commit 2528694

File tree

5 files changed

+25
-2
lines changed

5 files changed

+25
-2
lines changed

deploy/galaxy/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ resource "google_cloudbuild_trigger" "frontend" {
8484
name = "galaxy"
8585

8686
push {
87-
tag = "^siarnaq-frontend-.*"
87+
tag = var.frontend_trigger_tag_pattern
8888
}
8989
}
9090

@@ -156,6 +156,8 @@ module "siarnaq" {
156156
storage_public_name = google_storage_bucket.public.name
157157
storage_secure_name = google_storage_bucket.secure.name
158158
storage_ephemeral_name = google_storage_bucket.ephemeral.name
159+
160+
trigger_tag_pattern = var.siarnaq_trigger_tag_pattern
159161
}
160162

161163
module "titan" {

deploy/galaxy/variables.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,13 @@ variable "saturn_secrets" {
107107
description = "Secrets to inject into the Saturn secret manager"
108108
type = map
109109
}
110+
111+
variable "siarnaq_trigger_tag_pattern" {
112+
description = "Regex pattern for git tags that trigger Siarnaq backend builds"
113+
type = string
114+
}
115+
116+
variable "frontend_trigger_tag_pattern" {
117+
description = "Regex pattern for git tags that trigger frontend builds"
118+
type = string
119+
}

deploy/main.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ module "production" {
5555
saturn_secrets = var.saturn_secrets_production
5656
storage_releases_name = module.releases.storage_bucket_name
5757

58+
siarnaq_trigger_tag_pattern = "^siarnaq-backend-.*"
59+
frontend_trigger_tag_pattern = "^siarnaq-frontend-.*"
60+
5861
depends_on = [null_resource.apis]
5962
}
6063

@@ -88,6 +91,9 @@ module "staging" {
8891
saturn_secrets = var.saturn_secrets_staging
8992
storage_releases_name = module.releases.storage_bucket_name
9093

94+
siarnaq_trigger_tag_pattern = "^staging-siarnaq-.*"
95+
frontend_trigger_tag_pattern = "^staging-frontend-.*"
96+
9197
depends_on = [null_resource.apis]
9298
}
9399

deploy/siarnaq/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ resource "google_cloudbuild_trigger" "this" {
270270
name = "galaxy"
271271

272272
push {
273-
tag = "^siarnaq-backend-.*"
273+
tag = var.trigger_tag_pattern
274274
}
275275
}
276276

deploy/siarnaq/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,8 @@ variable "additional_secrets" {
7777
description = "Additional secrets to inject into the secret manager"
7878
type = map
7979
}
80+
81+
variable "trigger_tag_pattern" {
82+
description = "Regex pattern for git tags that trigger builds"
83+
type = string
84+
}

0 commit comments

Comments
 (0)