Skip to content

Commit 3f81fd6

Browse files
nammnnammn
committed
Merge branch 'multi-arch-pipeline-combined' of github.com:mongodb/mongodb-kubernetes into multi-arch-pipeline-combined
2 parents 2e55f50 + 9368a93 commit 3f81fd6

20 files changed

+721
-367
lines changed

‎.evergreen.yml

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ variables:
3333
variant: init_test_run
3434
- name: build_init_om_images_ubi
3535
variant: init_test_run
36-
- name: build_agent_images_ubi
37-
variant: init_test_run
3836

3937
- &base_no_om_image_dependency
4038
depends_on:
@@ -52,8 +50,6 @@ variables:
5250
variant: init_test_run
5351
- name: build_init_appdb_images_ubi
5452
variant: init_test_run
55-
- name: build_agent_images_ubi
56-
variant: init_test_run
5753

5854
- &community_dependency
5955
depends_on:
@@ -67,8 +63,6 @@ variables:
6763
variant: init_test_run
6864
- name: build_mco_test_image
6965
variant: init_test_run
70-
- name: build_agent_images_ubi
71-
variant: init_test_run
7266

7367
- &setup_group
7468
setup_group_can_fail_task: true
@@ -160,8 +154,6 @@ variables:
160154
variant: init_test_run
161155
- name: build_init_om_images_ubi
162156
variant: init_test_run
163-
- name: build_agent_images_ubi
164-
variant: init_test_run
165157

166158
- &base_om7_dependency_with_race
167159
depends_on:
@@ -179,8 +171,6 @@ variables:
179171
variant: init_test_run
180172
- name: build_init_om_images_ubi
181173
variant: init_test_run
182-
- name: build_agent_images_ubi
183-
variant: init_test_run
184174

185175
- &base_om8_dependency
186176
depends_on:
@@ -198,8 +188,6 @@ variables:
198188
variant: init_test_run
199189
- name: build_init_om_images_ubi
200190
variant: init_test_run
201-
- name: build_agent_images_ubi
202-
variant: init_test_run
203191

204192
parameters:
205193
- key: evergreen_retry
@@ -1489,8 +1477,6 @@ buildvariants:
14891477
variant: init_test_run
14901478
- name: build_init_om_images_ubi
14911479
variant: init_test_run
1492-
- name: build_agent_images_ubi
1493-
variant: init_test_run
14941480
- name: build_test_image_ibm
14951481
variant: init_test_run_ibm_power
14961482
tasks:
@@ -1514,8 +1500,6 @@ buildvariants:
15141500
variant: init_test_run
15151501
- name: build_init_om_images_ubi
15161502
variant: init_test_run
1517-
- name: build_agent_images_ubi
1518-
variant: init_test_run
15191503
- name: build_test_image_ibm
15201504
variant: init_test_run_ibm_z
15211505
tasks:
@@ -1531,6 +1515,62 @@ buildvariants:
15311515
tasks:
15321516
- name: e2e_smoke_arm_task_group
15331517

1518+
- name: e2e_static_smoke_arm
1519+
display_name: e2e_smoke_arm
1520+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1521+
run_on:
1522+
- ubuntu2204-arm64-large
1523+
allowed_requesters: [ "patch", "github_tag" ]
1524+
<<: *base_no_om_image_dependency
1525+
tasks:
1526+
- name: e2e_smoke_arm_task_group
1527+
1528+
- name: e2e_static_smoke_ibm_z
1529+
display_name: e2e_static_smoke_ibm_z
1530+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1531+
run_on:
1532+
- rhel9-zseries-small
1533+
- rhel9-zseries-large
1534+
allowed_requesters: [ "patch", "github_tag" ]
1535+
depends_on:
1536+
- name: build_operator_ubi
1537+
variant: init_test_run
1538+
- name: build_init_database_image_ubi
1539+
variant: init_test_run
1540+
- name: build_database_image_ubi
1541+
variant: init_test_run
1542+
- name: build_init_appdb_images_ubi
1543+
variant: init_test_run
1544+
- name: build_init_om_images_ubi
1545+
variant: init_test_run
1546+
- name: build_test_image_ibm
1547+
variant: init_test_run_ibm_z
1548+
tasks:
1549+
- name: e2e_smoke_ibm_task_group
1550+
1551+
- name: e2e_static_smoke_ibm_power
1552+
display_name: e2e_static_smoke_ibm_power
1553+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
1554+
run_on:
1555+
- rhel9-power-small
1556+
- rhel9-power-large
1557+
allowed_requesters: [ "patch", "github_tag" ]
1558+
depends_on:
1559+
- name: build_operator_ubi
1560+
variant: init_test_run
1561+
- name: build_init_database_image_ubi
1562+
variant: init_test_run
1563+
- name: build_database_image_ubi
1564+
variant: init_test_run
1565+
- name: build_init_appdb_images_ubi
1566+
variant: init_test_run
1567+
- name: build_init_om_images_ubi
1568+
variant: init_test_run
1569+
- name: build_test_image_ibm
1570+
variant: init_test_run_ibm_power
1571+
tasks:
1572+
- name: e2e_smoke_ibm_task_group
1573+
15341574
- name: e2e_static_smoke
15351575
display_name: e2e_static_smoke
15361576
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
@@ -1657,8 +1697,6 @@ buildvariants:
16571697
variant: init_test_run
16581698
- name: prepare_and_upload_openshift_bundles_for_e2e
16591699
variant: init_tests_with_olm
1660-
- name: build_agent_images_ubi
1661-
variant: init_test_run
16621700
tasks:
16631701
- name: e2e_kind_olm_group
16641702

@@ -1682,9 +1720,6 @@ buildvariants:
16821720
variant: init_tests_with_olm
16831721
- name: build_init_database_image_ubi
16841722
variant: init_test_run
1685-
- name: build_agent_images_ubi
1686-
variant: init_test_run
1687-
16881723
tasks:
16891724
- name: e2e_kind_olm_group
16901725

‎build_info.json

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
55
"patch": {
66
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes",
7-
"platforms": [
8-
"linux/amd64"
7+
"platforms": [
8+
"linux/arm64",
9+
"linux/amd64",
10+
"linux/s390x",
11+
"linux/ppc64le"
912
]
1013
},
1114
"staging": {
@@ -50,8 +53,11 @@
5053
"dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
5154
"patch": {
5255
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database",
53-
"platforms": [
54-
"linux/amd64"
56+
"platforms": [
57+
"linux/arm64",
58+
"linux/amd64",
59+
"linux/s390x",
60+
"linux/ppc64le"
5561
]
5662
},
5763
"staging": {
@@ -79,8 +85,11 @@
7985
"dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
8086
"patch": {
8187
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb",
82-
"platforms": [
83-
"linux/amd64"
88+
"platforms": [
89+
"linux/arm64",
90+
"linux/amd64",
91+
"linux/s390x",
92+
"linux/ppc64le"
8493
]
8594
},
8695
"staging": {
@@ -108,37 +117,34 @@
108117
"dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
109118
"patch": {
110119
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager",
111-
"platforms": [
120+
"platforms": [
112121
"linux/amd64"
113122
]
114123
},
115124
"staging": {
116125
"sign": true,
117126
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager",
118127
"platforms": [
119-
"linux/arm64",
120-
"linux/amd64",
121-
"linux/s390x",
122-
"linux/ppc64le"
128+
"linux/amd64"
123129
]
124130
},
125131
"release": {
126132
"sign": true,
127133
"repository": "quay.io/mongodb/mongodb-kubernetes-init-ops-manager",
128134
"platforms": [
129-
"linux/arm64",
130-
"linux/amd64",
131-
"linux/s390x",
132-
"linux/ppc64le"
135+
"linux/amd64"
133136
]
134137
}
135138
},
136139
"database": {
137140
"dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic",
138141
"patch": {
139142
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database",
140-
"platforms": [
141-
"linux/amd64"
143+
"platforms": [
144+
"linux/arm64",
145+
"linux/amd64",
146+
"linux/s390x",
147+
"linux/ppc64le"
142148
]
143149
},
144150
"staging": {
@@ -198,8 +204,11 @@
198204
"dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
199205
"patch": {
200206
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe",
201-
"platforms": [
202-
"linux/amd64"
207+
"platforms": [
208+
"linux/arm64",
209+
"linux/amd64",
210+
"linux/s390x",
211+
"linux/ppc64le"
203212
]
204213
},
205214
"staging": {
@@ -228,8 +237,11 @@
228237
"dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
229238
"patch": {
230239
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
231-
"platforms": [
232-
"linux/amd64"
240+
"platforms": [
241+
"linux/arm64",
242+
"linux/amd64",
243+
"linux/s390x",
244+
"linux/ppc64le"
233245
]
234246
},
235247
"staging": {
@@ -258,8 +270,11 @@
258270
"dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
259271
"patch": {
260272
"repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi",
261-
"platforms": [
262-
"linux/amd64"
273+
"platforms": [
274+
"linux/arm64",
275+
"linux/amd64",
276+
"linux/s390x",
277+
"linux/ppc64le"
263278
]
264279
},
265280
"staging": {

‎build_info_agent.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
{
22
"platform_mappings": {
33
"linux/amd64": {
4-
"agent_suffix": "linux_x86_64.tar.gz",
5-
"tools_suffix": "rhel93-x86_64-{TOOLS_VERSION}.tgz"
4+
"agent_suffixes": ["linux_x86_64.tar.gz"],
5+
"tools_suffix": "rhel93-x86_64-{TOOLS_VERSION}.tgz",
6+
"tools_suffix_old": "rhel90-x86_64-{TOOLS_VERSION}.tgz"
67
},
78
"linux/arm64": {
8-
"agent_suffix": "amzn2_aarch64.tar.gz",
9-
"tools_suffix": "rhel93-aarch64-{TOOLS_VERSION}.tgz"
9+
"agent_suffixes": ["amzn2_aarch64.tar.gz"],
10+
"tools_suffix": "rhel93-aarch64-{TOOLS_VERSION}.tgz",
11+
"tools_suffix_old": "rhel90-aarch64-{TOOLS_VERSION}.tgz"
1012
},
1113
"linux/s390x": {
12-
"agent_suffix": "rhel7_s390x.tar.gz",
13-
"tools_suffix": "rhel9-s390x-{TOOLS_VERSION}.tgz"
14+
"agent_suffixes": ["rhel7_s390x.tar.gz", "rhel8_s390x.tar.gz", "rhel9_s390x.tar.gz"],
15+
"tools_suffix": "rhel9-s390x-{TOOLS_VERSION}.tgz",
16+
"tools_suffix_old": "rhel83-s390x-{TOOLS_VERSION}.tgz"
1417
},
1518
"linux/ppc64le": {
16-
"agent_suffix": "rhel8_ppc64le.tar.gz",
17-
"tools_suffix": "rhel9-ppc64le-{TOOLS_VERSION}.tgz"
19+
"agent_suffixes": ["rhel8_ppc64le.tar.gz", "rhel7_ppc64le.tar.gz", "rhel9_ppc64le.tar.gz"],
20+
"tools_suffix": "rhel9-ppc64le-{TOOLS_VERSION}.tgz",
21+
"tools_suffix_old": "rhel81-ppc64le-{TOOLS_VERSION}.tgz"
1822
}
1923
},
2024
"base_names": {

‎docker/mongodb-agent-non-matrix/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)