Skip to content

Commit 5a63860

Browse files
MaciejKarasMaciejKaras
committed
Add podman tasks to build scenarios
1 parent 6b0f402 commit 5a63860

File tree

12 files changed

+245
-74
lines changed

12 files changed

+245
-74
lines changed

‎.evergreen-functions.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@ functions:
281281
- command: subprocess.exec
282282
type: setup
283283
params:
284+
env:
285+
SKIP_MINIKUBE_SETUP: ${skip_minikube_setup!|false}
286+
SKIP_INSTALL_REQUIREMENTS: ${skip_install_python_requirements!|true}
284287
working_dir: src/github.com/mongodb/mongodb-kubernetes
285288
add_to_path:
286289
- ${workdir}/bin
@@ -507,15 +510,6 @@ functions:
507510
- ${workdir}/bin
508511
- ${workdir}
509512

510-
build_test_image_ibm:
511-
- command: subprocess.exec
512-
params:
513-
shell: bash
514-
working_dir: src/github.com/mongodb/mongodb-kubernetes
515-
add_to_path:
516-
- ${workdir}/bin
517-
binary: scripts/evergreen/e2e/build_tests_image_ibm.sh
518-
519513
pipeline:
520514
- command: subprocess.exec
521515
retry_on_failure: true
@@ -524,6 +518,8 @@ functions:
524518
shell: bash
525519
<<: *e2e_include_expansions_in_env
526520
working_dir: src/github.com/mongodb/mongodb-kubernetes
521+
add_to_path:
522+
- ${workdir}/bin
527523
binary: scripts/release/pipeline.sh
528524
env:
529525
IMAGE_NAME: ${IMAGE_NAME}
@@ -537,6 +533,8 @@ functions:
537533
shell: bash
538534
<<: *e2e_include_expansions_in_env
539535
working_dir: src/github.com/mongodb/mongodb-kubernetes
536+
add_to_path:
537+
- ${workdir}/bin
540538
binary: scripts/release/pipeline_agent.sh
541539
env:
542540
FLAGS: ${FLAGS}
@@ -549,6 +547,8 @@ functions:
549547
shell: bash
550548
<<: *e2e_include_expansions_in_env
551549
working_dir: src/github.com/mongodb/mongodb-kubernetes
550+
add_to_path:
551+
- ${workdir}/bin
552552
binary: scripts/release/pipeline_ops_manager.sh
553553

554554
pipeline_readiness_probe:
@@ -559,6 +559,8 @@ functions:
559559
shell: bash
560560
<<: *e2e_include_expansions_in_env
561561
working_dir: src/github.com/mongodb/mongodb-kubernetes
562+
add_to_path:
563+
- ${workdir}/bin
562564
binary: scripts/release/pipeline_readiness_probe.sh
563565

564566
pipeline_version_upgrade_hook:
@@ -569,6 +571,8 @@ functions:
569571
shell: bash
570572
<<: *e2e_include_expansions_in_env
571573
working_dir: src/github.com/mongodb/mongodb-kubernetes
574+
add_to_path:
575+
- ${workdir}/bin
572576
binary: scripts/release/pipeline_version_upgrade_hook.sh
573577

574578
teardown_cloud_qa_all:

‎.evergreen-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ buildvariants:
209209
- release-rhel9-power-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
210210
- release-rhel9-power-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
211211
tasks:
212-
- name: build_test_image_ibm
212+
- name: build_test_image_ibm_power
213213

214214
- name: init_smoke_tests_ibm_z_release
215215
display_name: init_smoke_tests_ibm_z
@@ -220,7 +220,7 @@ buildvariants:
220220
- release-rhel9-zseries-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
221221
- release-rhel9-zseries-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
222222
tasks:
223-
- name: build_test_image_ibm
223+
- name: build_test_image_ibm_z
224224

225225
- name: init_smoke_tests_arm_release
226226
display_name: init_smoke_tests_arm

‎.evergreen.yml‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -363,21 +363,29 @@ tasks:
363363
vars:
364364
IMAGE_NAME: meko-tests-arm64
365365

366+
- name: build_test_image_ibm_z
367+
commands:
368+
- func: clone
369+
- func: setup_building_host_minikube
370+
vars:
371+
skip_minikube_setup: true
372+
skip_install_python_requirements: false
373+
- func: build_multi_cluster_binary
374+
- func: pipeline
375+
vars:
376+
IMAGE_NAME: meko-tests-ibm-z
366377

367-
- name: build_test_image_ibm
378+
- name: build_test_image_ibm_power
368379
commands:
369380
- func: clone
370-
- command: subprocess.exec
371-
type: setup
372-
params:
373-
env:
374-
SKIP_MINIKUBE_SETUP: "true"
375-
working_dir: src/github.com/mongodb/mongodb-kubernetes
376-
add_to_path:
377-
- ${workdir}/bin
378-
command: scripts/evergreen/setup_minikube_host.sh
381+
- func: setup_building_host_minikube
382+
vars:
383+
skip_minikube_setup: true
384+
skip_install_python_requirements: false
379385
- func: build_multi_cluster_binary
380-
- func: build_test_image_ibm
386+
- func: pipeline
387+
vars:
388+
IMAGE_NAME: meko-tests-ibm-power
381389

382390
- name: build_mco_test_image
383391
commands:
@@ -1396,7 +1404,7 @@ buildvariants:
13961404
variant: init_test_run
13971405
- name: build_database_image_ubi
13981406
variant: init_test_run
1399-
- name: build_test_image_ibm
1407+
- name: build_test_image_ibm_power
14001408
variant: init_test_run_ibm_power
14011409
tasks:
14021410
- name: e2e_smoke_ibm_task_group
@@ -1415,7 +1423,7 @@ buildvariants:
14151423
variant: init_test_run
14161424
- name: build_database_image_ubi
14171425
variant: init_test_run
1418-
- name: build_test_image_ibm
1426+
- name: build_test_image_ibm_power
14191427
variant: init_test_run_ibm_power
14201428
tasks:
14211429
- name: e2e_smoke_ibm_task_group
@@ -1434,7 +1442,7 @@ buildvariants:
14341442
variant: init_test_run
14351443
- name: build_database_image_ubi
14361444
variant: init_test_run
1437-
- name: build_test_image_ibm
1445+
- name: build_test_image_ibm_z
14381446
variant: init_test_run_ibm_z
14391447
tasks:
14401448
- name: e2e_smoke_ibm_task_group
@@ -1451,7 +1459,7 @@ buildvariants:
14511459
variant: init_test_run
14521460
- name: build_init_database_image_ubi
14531461
variant: init_test_run
1454-
- name: build_test_image_ibm
1462+
- name: build_test_image_ibm_z
14551463
variant: init_test_run_ibm_z
14561464
tasks:
14571465
- name: e2e_smoke_ibm_task_group
@@ -1700,7 +1708,7 @@ buildvariants:
17001708
- rhel9-power-small
17011709
- rhel9-power-large
17021710
tasks:
1703-
- name: build_test_image_ibm
1711+
- name: build_test_image_ibm_power
17041712

17051713
- name: init_test_run_ibm_z
17061714
display_name: init_test_run_ibm_z
@@ -1710,7 +1718,7 @@ buildvariants:
17101718
- rhel9-zseries-small
17111719
- rhel9-zseries-large
17121720
tasks:
1713-
- name: build_test_image_ibm
1721+
- name: build_test_image_ibm_z
17141722

17151723
- name: init_test_run_arm
17161724
display_name: init_test_run_arm

‎build_info.json‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,68 @@
220220
"architecture_suffix": true
221221
}
222222
},
223+
"meko-tests-ibm-z": {
224+
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
225+
"builder": "podman",
226+
"patch": {
227+
"repositories": [
228+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"
229+
],
230+
"platforms": [
231+
"linux/s390x"
232+
],
233+
"architecture_suffix": true
234+
},
235+
"staging": {
236+
"repositories": [
237+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
238+
],
239+
"platforms": [
240+
"linux/s390x"
241+
],
242+
"architecture_suffix": true
243+
},
244+
"release": {
245+
"repositories": [
246+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
247+
],
248+
"platforms": [
249+
"linux/s390x"
250+
],
251+
"architecture_suffix": true
252+
}
253+
},
254+
"meko-tests-ibm-power": {
255+
"dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile",
256+
"builder": "podman",
257+
"patch": {
258+
"repositories": [
259+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests"
260+
],
261+
"platforms": [
262+
"linux/ppc64le"
263+
],
264+
"architecture_suffix": true
265+
},
266+
"staging": {
267+
"repositories": [
268+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
269+
],
270+
"platforms": [
271+
"linux/ppc64le"
272+
],
273+
"architecture_suffix": true
274+
},
275+
"release": {
276+
"repositories": [
277+
"268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests"
278+
],
279+
"platforms": [
280+
"linux/ppc64le"
281+
],
282+
"architecture_suffix": true
283+
}
284+
},
223285
"mco-tests": {
224286
"dockerfile-path": "docker/mongodb-community-tests/Dockerfile",
225287
"patch": {

‎scripts/dev/recreate_python_venv.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,14 @@ ensure_required_python() {
8686
# Check if the required version is already installed
8787
if pyenv versions --bare | grep -q "^${required_version}$"; then
8888
echo "Python ${required_version} already installed via pyenv" >&2
89+
pyenv global "${required_version}"
8990
return 0
9091
fi
9192

9293
# Its not installed!
9394
echo "Installing Python ${required_version} via pyenv..." >&2
9495
if pyenv install "${required_version}"; then
96+
pyenv global "${required_version}"
9597
return 0
9698
else
9799
echo "Error: Failed to install Python ${required_version} via pyenv" >&2

‎scripts/evergreen/e2e/build_tests_image_ibm.sh‎

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

‎scripts/evergreen/setup_minikube_host.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ run_setup_step() {
4040

4141
# Setup Python environment (needed for AWS CLI pip installation)
4242
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
43-
export SKIP_INSTALL_REQUIREMENTS=true
43+
export SKIP_INSTALL_REQUIREMENTS=${SKIP_INSTALL_REQUIREMENTS:-true}
4444
run_setup_step "Python Virtual Environment" "scripts/dev/recreate_python_venv.sh"
4545

4646
run_setup_step "AWS CLI Setup" "scripts/evergreen/setup_aws.sh"

0 commit comments

Comments
 (0)