Skip to content

Commit 33e7ee0

Browse files
committed
fix merge
1 parent 74328eb commit 33e7ee0

File tree

8 files changed

+13
-602
lines changed

8 files changed

+13
-602
lines changed

build_info.json

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic",
55
"patch": {
66
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes"],
7-
"platforms": [
7+
"platforms": [
88
"linux/amd64"
99
]
1010
},
@@ -49,7 +49,7 @@
4949
"dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic",
5050
"patch": {
5151
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database"],
52-
"platforms": [
52+
"platforms": [
5353
"linux/amd64"
5454
]
5555
},
@@ -78,7 +78,7 @@
7878
"dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic",
7979
"patch": {
8080
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb"],
81-
"platforms": [
81+
"platforms": [
8282
"linux/amd64"
8383
]
8484
},
@@ -107,7 +107,7 @@
107107
"dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic",
108108
"patch": {
109109
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager"],
110-
"platforms": [
110+
"platforms": [
111111
"linux/amd64"
112112
]
113113
},
@@ -130,7 +130,7 @@
130130
"dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic",
131131
"patch": {
132132
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database"],
133-
"platforms": [
133+
"platforms": [
134134
"linux/amd64"
135135
]
136136
},
@@ -190,7 +190,7 @@
190190
"dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
191191
"patch": {
192192
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe"],
193-
"platforms": [
193+
"platforms": [
194194
"linux/amd64"
195195
]
196196
},
@@ -199,9 +199,7 @@
199199
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe"],
200200
"platforms": [
201201
"linux/arm64",
202-
"linux/amd64",
203-
"linux/s390x",
204-
"linux/ppc64le"
202+
"linux/amd64"
205203
]
206204
},
207205
"release": {
@@ -212,17 +210,15 @@
212210
],
213211
"platforms": [
214212
"linux/arm64",
215-
"linux/amd64",
216-
"linux/s390x",
217-
"linux/ppc64le"
213+
"linux/amd64"
218214
]
219215
}
220216
},
221217
"upgrade-hook": {
222218
"dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
223219
"patch": {
224220
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
225-
"platforms": [
221+
"platforms": [
226222
"linux/amd64"
227223
]
228224
},
@@ -231,9 +227,7 @@
231227
"repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
232228
"platforms": [
233229
"linux/arm64",
234-
"linux/amd64",
235-
"linux/s390x",
236-
"linux/ppc64le"
230+
"linux/amd64"
237231
]
238232
},
239233
"release": {
@@ -242,9 +236,7 @@
242236
"repositories": ["quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook"],
243237
"platforms": [
244238
"linux/arm64",
245-
"linux/amd64",
246-
"linux/s390x",
247-
"linux/ppc64le"
239+
"linux/amd64"
248240
]
249241
}
250242
},

scripts/dev/prepare_local_e2e_run.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ prepare_operator_config_map "$(kubectl config current-context)" 2>&1 | prepend "
6060
rm -rf docker/mongodb-kubernetes-tests/helm_chart
6161
cp -rf helm_chart docker/mongodb-kubernetes-tests/helm_chart
6262

63-
rm -rf docker/mongodb-kubernetes-tests/public
64-
cp -rf public docker/mongodb-kubernetes-tests/public
65-
cp release.json docker/mongodb-kubernetes-tests/release.json
66-
cp requirements.txt docker/mongodb-kubernetes-tests/requirements.txt
67-
6863
# shellcheck disable=SC2154
6964
if [[ "${KUBE_ENVIRONMENT_NAME}" == "multi" ]]; then
7065
prepare_multi_cluster_e2e_run 2>&1 | prepend "prepare_multi_cluster_e2e_run"

scripts/evergreen/e2e/build_e2e_image_ibm.sh

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

scripts/minikube/install-minikube.sh

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

0 commit comments

Comments
 (0)