Skip to content

Commit d5590e9

Browse files
nammnnammn
committed
Merge branch 'master' of github.com:mongodb/mongodb-kubernetes into multi-arch-pipeline-combined
2 parents d20e10f + 637923f commit d5590e9

File tree

10 files changed

+155
-123
lines changed

10 files changed

+155
-123
lines changed

‎.evergreen-functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ functions:
559559
shell: bash
560560
<<: *e2e_include_expansions_in_env
561561
working_dir: src/github.com/mongodb/mongodb-kubernetes
562-
binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel ${image_name} ${all_agents}
562+
binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel ${image_name} ${all_agents} ${build_scenario}
563563

564564
# TODO: CLOUDP-335471 ; once all image builds are made with the new atomic pipeline, remove the following function
565565
legacy_pipeline:

‎.evergreen.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,10 @@ tasks:
351351
- func: setup_building_host
352352
- func: quay_login
353353
- func: setup_docker_sbom
354-
- func: legacy_pipeline
354+
- func: pipeline
355355
vars:
356356
image_name: agent
357+
build_scenario: --build-scenario manual_release
357358

358359
- name: run_precommit_and_push
359360
tags: ["patch-run"]
@@ -565,10 +566,10 @@ tasks:
565566
- func: setup_building_host
566567
- func: quay_login
567568
- func: setup_docker_sbom
568-
- func: legacy_pipeline
569+
- func: pipeline
569570
vars:
570571
image_name: ops-manager
571-
include_tags: release
572+
build_scenario: --build-scenario manual_release
572573

573574
- name: prepare_and_upload_openshift_bundles_for_e2e
574575
commands:
@@ -1288,7 +1289,7 @@ buildvariants:
12881289
display_name: e2e_mdb_kind_ubi_cloudqa
12891290
tags: [ "e2e_test_suite", "cloudqa" ]
12901291
run_on:
1291-
- ubuntu2204-large
1292+
- ubuntu2204-medium
12921293
<<: *base_no_om_image_dependency
12931294
tasks:
12941295
- name: e2e_mdb_kind_cloudqa_task_group
@@ -1306,7 +1307,7 @@ buildvariants:
13061307
display_name: e2e_static_mdb_kind_ubi_cloudqa
13071308
tags: [ "e2e_test_suite", "cloudqa" ]
13081309
run_on:
1309-
- ubuntu2204-large
1310+
- ubuntu2204-medium
13101311
<<: *base_no_om_image_dependency
13111312
tasks:
13121313
- name: e2e_mdb_kind_cloudqa_task_group
@@ -1408,7 +1409,7 @@ buildvariants:
14081409
display_name: e2e_static_om70_kind_ubi
14091410
tags: [ "e2e_test_suite" ]
14101411
run_on:
1411-
- ubuntu2204-large
1412+
- ubuntu2204-medium
14121413
<<: *base_om7_dependency
14131414
tasks:
14141415
- name: e2e_static_ops_manager_kind_only_task_group
@@ -1431,7 +1432,7 @@ buildvariants:
14311432
display_name: e2e_static_om80_kind_ubi
14321433
tags: [ "e2e_test_suite" ]
14331434
run_on:
1434-
- ubuntu2204-large
1435+
- ubuntu2204-medium
14351436
<<: *base_om8_dependency
14361437
tasks:
14371438
- name: e2e_static_ops_manager_kind_only_task_group

‎build_info.json

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"operator": {
44
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
55
"patch": {
6-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
6+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
77
"platforms": [
88
"linux/amd64"
99
]
1010
},
1111
"staging": {
1212
"sign": true,
13-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
13+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
1414
"platforms": [
1515
"linux/arm64",
1616
"linux/amd64",
@@ -20,7 +20,7 @@
2020
},
2121
"release": {
2222
"sign": true,
23-
"repository": ["quay.io/mongodb/mongodb-kubernetes"],
23+
"repositories": ["quay.io/mongodb/mongodb-kubernetes"],
2424
"platforms": [
2525
"linux/arm64",
2626
"linux/amd64",
@@ -32,14 +32,14 @@
3232
"operator-race": {
3333
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
3434
"patch": {
35-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
35+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
3636
"platforms": [
3737
"linux/amd64"
3838
]
3939
},
4040
"staging": {
4141
"sign": true,
42-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
42+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes"],
4343
"platforms": [
4444
"linux/arm64",
4545
"linux/amd64"
@@ -49,14 +49,14 @@
4949
"init-database": {
5050
"dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
5151
"patch": {
52-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"],
52+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"],
5353
"platforms": [
5454
"linux/amd64"
5555
]
5656
},
5757
"staging": {
5858
"sign": true,
59-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database"],
59+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database"],
6060
"platforms": [
6161
"linux/arm64",
6262
"linux/amd64",
@@ -66,7 +66,7 @@
6666
},
6767
"release": {
6868
"sign": true,
69-
"repository": ["quay.io/mongodb/mongodb-kubernetes-init-database"],
69+
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-database"],
7070
"platforms": [
7171
"linux/arm64",
7272
"linux/amd64",
@@ -78,14 +78,14 @@
7878
"init-appdb": {
7979
"dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
8080
"patch": {
81-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"],
81+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"],
8282
"platforms": [
8383
"linux/amd64"
8484
]
8585
},
8686
"staging": {
8787
"sign": true,
88-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb"],
88+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb"],
8989
"platforms": [
9090
"linux/arm64",
9191
"linux/amd64",
@@ -95,7 +95,7 @@
9595
},
9696
"release": {
9797
"sign": true,
98-
"repository": ["quay.io/mongodb/mongodb-kubernetes-init-appdb"],
98+
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-appdb"],
9999
"platforms": [
100100
"linux/arm64",
101101
"linux/amd64",
@@ -107,21 +107,21 @@
107107
"init-ops-manager": {
108108
"dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
109109
"patch": {
110-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"],
110+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"],
111111
"platforms": [
112112
"linux/amd64"
113113
]
114114
},
115115
"staging": {
116116
"sign": true,
117-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager"],
117+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager"],
118118
"platforms": [
119119
"linux/amd64"
120120
]
121121
},
122122
"release": {
123123
"sign": true,
124-
"repository": ["quay.io/mongodb/mongodb-kubernetes-init-ops-manager"],
124+
"repositories": ["quay.io/mongodb/mongodb-kubernetes-init-ops-manager"],
125125
"platforms": [
126126
"linux/amd64"
127127
]
@@ -130,14 +130,14 @@
130130
"database": {
131131
"dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic",
132132
"patch": {
133-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"],
133+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"],
134134
"platforms": [
135135
"linux/amd64"
136136
]
137137
},
138138
"staging": {
139139
"sign": true,
140-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database"],
140+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database"],
141141
"platforms": [
142142
"linux/arm64",
143143
"linux/amd64",
@@ -147,7 +147,7 @@
147147
},
148148
"release": {
149149
"sign": true,
150-
"repository": ["quay.io/mongodb/mongodb-kubernetes-database"],
150+
"repositories": ["quay.io/mongodb/mongodb-kubernetes-database"],
151151
"platforms": [
152152
"linux/arm64",
153153
"linux/amd64",
@@ -159,13 +159,13 @@
159159
"meko-tests": {
160160
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
161161
"patch": {
162-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"],
162+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"],
163163
"platforms": [
164164
"linux/amd64"
165165
]
166166
},
167167
"staging": {
168-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"],
168+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"],
169169
"platforms": [
170170
"linux/arm64",
171171
"linux/amd64"
@@ -175,13 +175,13 @@
175175
"mco-tests": {
176176
"dockerfile-path": "docker/mongodb-community-tests/Dockerfile",
177177
"patch": {
178-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests"],
178+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests"],
179179
"platforms": [
180180
"linux/amd64"
181181
]
182182
},
183183
"staging": {
184-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-community-tests"],
184+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-community-tests"],
185185
"platforms": [
186186
"linux/amd64"
187187
]
@@ -190,14 +190,14 @@
190190
"readiness-probe": {
191191
"dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
192192
"patch": {
193-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"],
193+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"],
194194
"platforms": [
195195
"linux/amd64"
196196
]
197197
},
198198
"staging": {
199199
"sign": true,
200-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe"],
200+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe"],
201201
"platforms": [
202202
"linux/arm64",
203203
"linux/amd64",
@@ -208,7 +208,7 @@
208208
"release": {
209209
"version": "1.0.22",
210210
"sign": true,
211-
"repository": [
211+
"repositories": [
212212
"quay.io/mongodb/mongodb-kubernetes-readinessprobe"
213213
],
214214
"platforms": [
@@ -222,14 +222,14 @@
222222
"upgrade-hook": {
223223
"dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
224224
"patch": {
225-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
225+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
226226
"platforms": [
227227
"linux/amd64"
228228
]
229229
},
230230
"staging": {
231231
"sign": true,
232-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
232+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
233233
"platforms": [
234234
"linux/arm64",
235235
"linux/amd64",
@@ -240,7 +240,7 @@
240240
"release": {
241241
"version": "1.0.9",
242242
"sign": true,
243-
"repository": ["quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
243+
"repositories": ["quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
244244
"platforms": [
245245
"linux/arm64",
246246
"linux/amd64",
@@ -252,24 +252,24 @@
252252
"agent": {
253253
"dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
254254
"patch": {
255-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
255+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
256256
"platforms": [
257257
"linux/amd64"
258258
]
259259
},
260260
"staging": {
261261
"sign": true,
262-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
262+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
263263
"platforms": [
264264
"linux/arm64",
265265
"linux/amd64",
266266
"linux/s390x",
267267
"linux/ppc64le"
268268
]
269269
},
270-
"release": {
270+
"manual_release": {
271271
"sign": true,
272-
"repository": ["quay.io/mongodb/mongodb-agent-ubi", "quay.io/mongodb/mongodb-agent"],
272+
"repositories": ["quay.io/mongodb/mongodb-agent-ubi", "quay.io/mongodb/mongodb-agent"],
273273
"platforms": [
274274
"linux/arm64",
275275
"linux/amd64",
@@ -282,23 +282,22 @@
282282
"dockerfile-path": "docker/mongodb-enterprise-ops-manager/Dockerfile.atomic",
283283
"patch": {
284284
"version": "om-version-from-release.json",
285-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager"],
285+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager"],
286286
"platforms": [
287287
"linux/amd64"
288288
]
289289
},
290290
"staging": {
291291
"version": "om-version-from-release.json",
292292
"sign": true,
293-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager"],
293+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager"],
294294
"platforms": [
295295
"linux/amd64"
296296
]
297297
},
298-
"release": {
299-
"version": "om-version-from-release.json",
298+
"manual_release": {
300299
"sign": true,
301-
"repository": ["quay.io/mongodb/mongodb-enterprise-ops-manager"],
300+
"repositories": ["quay.io/mongodb/mongodb-enterprise-ops-manager"],
302301
"platforms": [
303302
"linux/amd64"
304303
]
@@ -338,15 +337,15 @@
338337
"helm-charts": {
339338
"mongodb-kubernetes": {
340339
"patch": {
341-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/helm-charts"]
340+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/helm-charts"]
342341
},
343342
"staging": {
344343
"sign": true,
345-
"repository": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/helm-charts"]
344+
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/helm-charts"]
346345
},
347346
"release": {
348347
"sign": true,
349-
"repository": ["quay.io/mongodb/helm-charts"]
348+
"repositories": ["quay.io/mongodb/helm-charts"]
350349
}
351350
}
352351
}

0 commit comments

Comments
 (0)