Skip to content

Commit 3b7e3b1

Browse files
dmajeredmajere
authored
ref(s4s2): Switch s4s and s4s2 places in pipedream (#86)
* ref(s4s2): Make s4s2 region prod in pipelines * +fix tests * -s4s to test regions
1 parent d0490a3 commit 3b7e3b1

33 files changed

Lines changed: 459 additions & 273 deletions

File tree

‎libs/getsentry.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
// These regions are user facing deployments
77
prod_regions: [
8-
's4s',
8+
's4s2',
99
'de',
1010
'us',
1111
// 'control' is excluded by default and must be explicitly included
@@ -19,7 +19,7 @@
1919
],
2020
// Test regions will deploy in parallel to the regions above
2121
test_regions: [
22-
's4s2',
22+
's4s',
2323
],
2424
is_st(region):: (region == 's4s' || std.startsWith(region, 'customer-')),
2525
}

‎test/pipedream.js‎

Lines changed: 217 additions & 47 deletions
Large diffs are not rendered by default.

‎test/testdata/goldens/getsentry/regions.jsonnet_output-files.golden‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"all_regions": [
3-
"s4s",
3+
"s4s2",
44
"de",
55
"us",
66
"control",
@@ -9,6 +9,6 @@
99
"customer-2",
1010
"customer-4",
1111
"customer-7",
12-
"s4s2"
12+
"s4s"
1313
]
1414
}

‎test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_output-files.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"format_version": 10,
194194
"pipelines": {
195195
"deploy-example-s4s": {
196-
"display_order": 2,
196+
"display_order": 9,
197197
"group": "example",
198198
"materials": {
199199
"example_repo": {
@@ -231,7 +231,7 @@
231231
"format_version": 10,
232232
"pipelines": {
233233
"deploy-example-s4s2": {
234-
"display_order": 9,
234+
"display_order": 2,
235235
"group": "example",
236236
"materials": {
237237
"example_repo": {
@@ -309,9 +309,9 @@
309309
"rollback-example": {
310310
"display_order": 1,
311311
"environment_variables": {
312-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
312+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
313313
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
314-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
314+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
315315
"ROLLBACK_MATERIAL_NAME": "example_repo",
316316
"ROLLBACK_STAGE": "example_stage",
317317
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/autodeploy-parallel.jsonnet_single-file.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
]
168168
},
169169
"deploy-example-s4s": {
170-
"display_order": 2,
170+
"display_order": 9,
171171
"group": "example",
172172
"materials": {
173173
"example_repo": {
@@ -200,7 +200,7 @@
200200
]
201201
},
202202
"deploy-example-s4s2": {
203-
"display_order": 9,
203+
"display_order": 2,
204204
"group": "example",
205205
"materials": {
206206
"example_repo": {
@@ -268,9 +268,9 @@
268268
"rollback-example": {
269269
"display_order": 1,
270270
"environment_variables": {
271-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
271+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
272272
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
273-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
273+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
274274
"ROLLBACK_MATERIAL_NAME": "example_repo",
275275
"ROLLBACK_STAGE": "example_stage",
276276
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_output-files.golden‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@
174174
"display_order": 3,
175175
"group": "example",
176176
"materials": {
177-
"deploy-example-s4s-pipeline-complete": {
178-
"pipeline": "deploy-example-s4s",
177+
"deploy-example-s4s2-pipeline-complete": {
178+
"pipeline": "deploy-example-s4s2",
179179
"stage": "pipeline-complete"
180180
},
181181
"example_repo": {
@@ -213,7 +213,7 @@
213213
"format_version": 10,
214214
"pipelines": {
215215
"deploy-example-s4s": {
216-
"display_order": 2,
216+
"display_order": 9,
217217
"group": "example",
218218
"materials": {
219219
"example_repo": {
@@ -251,7 +251,7 @@
251251
"format_version": 10,
252252
"pipelines": {
253253
"deploy-example-s4s2": {
254-
"display_order": 9,
254+
"display_order": 2,
255255
"group": "example",
256256
"materials": {
257257
"example_repo": {
@@ -333,9 +333,9 @@
333333
"rollback-example": {
334334
"display_order": 1,
335335
"environment_variables": {
336-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
336+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
337337
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
338-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
338+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
339339
"ROLLBACK_MATERIAL_NAME": "example_repo",
340340
"ROLLBACK_STAGE": "example_stage",
341341
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/autodeploy-serial.jsonnet_single-file.golden‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153
"display_order": 3,
154154
"group": "example",
155155
"materials": {
156-
"deploy-example-s4s-pipeline-complete": {
157-
"pipeline": "deploy-example-s4s",
156+
"deploy-example-s4s2-pipeline-complete": {
157+
"pipeline": "deploy-example-s4s2",
158158
"stage": "pipeline-complete"
159159
},
160160
"example_repo": {
@@ -187,7 +187,7 @@
187187
]
188188
},
189189
"deploy-example-s4s": {
190-
"display_order": 2,
190+
"display_order": 9,
191191
"group": "example",
192192
"materials": {
193193
"example_repo": {
@@ -220,7 +220,7 @@
220220
]
221221
},
222222
"deploy-example-s4s2": {
223-
"display_order": 9,
223+
"display_order": 2,
224224
"group": "example",
225225
"materials": {
226226
"example_repo": {
@@ -292,9 +292,9 @@
292292
"rollback-example": {
293293
"display_order": 1,
294294
"environment_variables": {
295-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
295+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
296296
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
297-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
297+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-us --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
298298
"ROLLBACK_MATERIAL_NAME": "example_repo",
299299
"ROLLBACK_STAGE": "example_stage",
300300
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_output-files.golden‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"format_version": 10,
44
"pipelines": {
55
"deploy-example-customer-1": {
6-
"display_order": 3,
6+
"display_order": 4,
77
"group": "example",
88
"materials": {
99
"example_repo": {
@@ -41,7 +41,7 @@
4141
"format_version": 10,
4242
"pipelines": {
4343
"deploy-example-customer-2": {
44-
"display_order": 4,
44+
"display_order": 5,
4545
"group": "example",
4646
"materials": {
4747
"example_repo": {
@@ -79,7 +79,7 @@
7979
"format_version": 10,
8080
"pipelines": {
8181
"deploy-example-customer-4": {
82-
"display_order": 5,
82+
"display_order": 6,
8383
"group": "example",
8484
"materials": {
8585
"example_repo": {
@@ -117,7 +117,7 @@
117117
"format_version": 10,
118118
"pipelines": {
119119
"deploy-example-customer-7": {
120-
"display_order": 6,
120+
"display_order": 7,
121121
"group": "example",
122122
"materials": {
123123
"example_repo": {
@@ -155,7 +155,7 @@
155155
"format_version": 10,
156156
"pipelines": {
157157
"deploy-example-de": {
158-
"display_order": 2,
158+
"display_order": 3,
159159
"group": "example",
160160
"materials": {
161161
"example_repo": {
@@ -193,7 +193,7 @@
193193
"format_version": 10,
194194
"pipelines": {
195195
"deploy-example-s4s2": {
196-
"display_order": 7,
196+
"display_order": 2,
197197
"group": "example",
198198
"materials": {
199199
"example_repo": {
@@ -233,9 +233,9 @@
233233
"rollback-example": {
234234
"display_order": 1,
235235
"environment_variables": {
236-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
236+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
237237
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
238-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
238+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
239239
"ROLLBACK_MATERIAL_NAME": "example_repo",
240240
"ROLLBACK_STAGE": "example_stage",
241241
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/exclude-regions-autodeploy-parallel.jsonnet_single-file.golden‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"format_version": 10,
33
"pipelines": {
44
"deploy-example-customer-1": {
5-
"display_order": 3,
5+
"display_order": 4,
66
"group": "example",
77
"materials": {
88
"example_repo": {
@@ -35,7 +35,7 @@
3535
]
3636
},
3737
"deploy-example-customer-2": {
38-
"display_order": 4,
38+
"display_order": 5,
3939
"group": "example",
4040
"materials": {
4141
"example_repo": {
@@ -68,7 +68,7 @@
6868
]
6969
},
7070
"deploy-example-customer-4": {
71-
"display_order": 5,
71+
"display_order": 6,
7272
"group": "example",
7373
"materials": {
7474
"example_repo": {
@@ -101,7 +101,7 @@
101101
]
102102
},
103103
"deploy-example-customer-7": {
104-
"display_order": 6,
104+
"display_order": 7,
105105
"group": "example",
106106
"materials": {
107107
"example_repo": {
@@ -134,7 +134,7 @@
134134
]
135135
},
136136
"deploy-example-de": {
137-
"display_order": 2,
137+
"display_order": 3,
138138
"group": "example",
139139
"materials": {
140140
"example_repo": {
@@ -167,7 +167,7 @@
167167
]
168168
},
169169
"deploy-example-s4s2": {
170-
"display_order": 7,
170+
"display_order": 2,
171171
"group": "example",
172172
"materials": {
173173
"example_repo": {
@@ -202,9 +202,9 @@
202202
"rollback-example": {
203203
"display_order": 1,
204204
"environment_variables": {
205-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
205+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
206206
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
207-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
207+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
208208
"ROLLBACK_MATERIAL_NAME": "example_repo",
209209
"ROLLBACK_STAGE": "example_stage",
210210
"TRIGGERED_BY": ""

‎test/testdata/goldens/pipedream/exclude-regions-autodeploy-serial.jsonnet_output-files.golden‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"format_version": 10,
44
"pipelines": {
55
"deploy-example-customer-1": {
6-
"display_order": 3,
6+
"display_order": 4,
77
"group": "example",
88
"materials": {
99
"deploy-example-de-pipeline-complete": {
@@ -45,7 +45,7 @@
4545
"format_version": 10,
4646
"pipelines": {
4747
"deploy-example-customer-2": {
48-
"display_order": 4,
48+
"display_order": 5,
4949
"group": "example",
5050
"materials": {
5151
"deploy-example-customer-1-pipeline-complete": {
@@ -87,7 +87,7 @@
8787
"format_version": 10,
8888
"pipelines": {
8989
"deploy-example-customer-4": {
90-
"display_order": 5,
90+
"display_order": 6,
9191
"group": "example",
9292
"materials": {
9393
"deploy-example-customer-2-pipeline-complete": {
@@ -129,7 +129,7 @@
129129
"format_version": 10,
130130
"pipelines": {
131131
"deploy-example-customer-7": {
132-
"display_order": 6,
132+
"display_order": 7,
133133
"group": "example",
134134
"materials": {
135135
"deploy-example-customer-4-pipeline-complete": {
@@ -171,9 +171,13 @@
171171
"format_version": 10,
172172
"pipelines": {
173173
"deploy-example-de": {
174-
"display_order": 2,
174+
"display_order": 3,
175175
"group": "example",
176176
"materials": {
177+
"deploy-example-s4s2-pipeline-complete": {
178+
"pipeline": "deploy-example-s4s2",
179+
"stage": "pipeline-complete"
180+
},
177181
"example_repo": {
178182
"branch": "master",
179183
"destination": "example",
@@ -209,7 +213,7 @@
209213
"format_version": 10,
210214
"pipelines": {
211215
"deploy-example-s4s2": {
212-
"display_order": 7,
216+
"display_order": 2,
213217
"group": "example",
214218
"materials": {
215219
"example_repo": {
@@ -249,9 +253,9 @@
249253
"rollback-example": {
250254
"display_order": 1,
251255
"environment_variables": {
252-
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
256+
"ALL_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
253257
"GOCD_ACCESS_TOKEN": "{{SECRET:[devinfra][gocd_access_token]}}",
254-
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
258+
"REGION_PIPELINE_FLAGS": "--pipeline=deploy-example-s4s2 --pipeline=deploy-example-de --pipeline=deploy-example-customer-1 --pipeline=deploy-example-customer-2 --pipeline=deploy-example-customer-4 --pipeline=deploy-example-customer-7",
255259
"ROLLBACK_MATERIAL_NAME": "example_repo",
256260
"ROLLBACK_STAGE": "example_stage",
257261
"TRIGGERED_BY": ""

0 commit comments

Comments
 (0)