Skip to content

Commit 97c7f39

Browse files
committed
Merge branch 'maciejk/ar-image-staging' into maciejk/ar-missing-releases
# Conflicts: # scripts/dev/contexts/root-context
2 parents 15d63da + b406574 commit 97c7f39

File tree

123 files changed

+1234
-1616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+1234
-1616
lines changed

.evergreen-functions.yml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,15 @@ functions:
8080
echo "Finished initializing to the root context"
8181
8282
switch_context: &switch_context
83-
command: shell.exec
83+
command: subprocess.exec
8484
type: setup
8585
params:
86-
shell: bash
8786
working_dir: src/github.com/mongodb/mongodb-kubernetes
8887
<<: *e2e_include_expansions_in_env
8988
add_to_path:
9089
- ${workdir}/bin
9190
- ${workdir}/google-cloud-sdk/bin
92-
script: |
93-
echo "Switching context"
94-
scripts/dev/switch_context.sh "${build_variant}"
95-
echo "Finished switching context"
91+
command: scripts/dev/switch_context.sh "${build_variant}"
9692

9793
python_venv: &python_venv
9894
command: subprocess.exec
@@ -245,6 +241,15 @@ functions:
245241
- ${workdir}/bin
246242
binary: scripts/dev/setup_evg_host.sh
247243

244+
setup_chart_testing_cli: &setup_chart_testing_cli
245+
command: subprocess.exec
246+
type: setup
247+
params:
248+
working_dir: src/github.com/mongodb/mongodb-kubernetes
249+
add_to_path:
250+
- ${workdir}/bin
251+
command: scripts/dev/setup_chart_testing_cli.sh
252+
248253
lint_repo:
249254
- command: subprocess.exec
250255
type: setup
@@ -253,6 +258,7 @@ functions:
253258
add_to_path:
254259
- ${workdir}/bin
255260
command: scripts/evergreen/setup_yq.sh
261+
- *setup_chart_testing_cli
256262
- command: subprocess.exec
257263
type: test
258264
params:
@@ -264,7 +270,6 @@ functions:
264270

265271
# Configures docker authentication to ECR and RH registries.
266272
setup_building_host:
267-
- *switch_context
268273
- *python_venv
269274
- *setup_aws
270275
- *setup_evg_host
@@ -273,7 +278,6 @@ functions:
273278
# This differs for normal evg_host as we require minikube instead of kind for
274279
# IBM machines also install aws cli via pip instead and use podman
275280
setup_building_host_minikube:
276-
- *switch_context
277281
- command: subprocess.exec
278282
type: setup
279283
params:
@@ -298,7 +302,6 @@ functions:
298302
# the task configures the set of tools necessary for any task working with K8 cluster:
299303
# installs kubectl, jq, kind (if necessary), configures docker authentication
300304
download_kube_tools:
301-
- *switch_context
302305
- *setup_kubectl
303306
- *setup_jq
304307
# we need aws to configure docker authentication
@@ -348,7 +351,6 @@ functions:
348351
command: "docker login quay.io -u ${quay_prod_username} -p ${quay_prod_robot_token}"
349352

350353
setup_cloud_qa:
351-
- *switch_context
352354
- command: shell.exec
353355
type: setup
354356
params:
@@ -479,7 +481,6 @@ functions:
479481
files: [ "src/github.com/mongodb/mongodb-kubernetes/logs/*.suite" ]
480482

481483
preflight_image:
482-
- *switch_context
483484
- command: subprocess.exec
484485
params:
485486
working_dir: src/github.com/mongodb/mongodb-kubernetes
@@ -507,7 +508,6 @@ functions:
507508
- ${workdir}
508509

509510
build_test_image_ibm:
510-
- *switch_context
511511
- command: subprocess.exec
512512
params:
513513
shell: bash
@@ -517,7 +517,6 @@ functions:
517517
binary: scripts/evergreen/e2e/build_tests_image_ibm.sh
518518

519519
pipeline:
520-
- *switch_context
521520
- command: subprocess.exec
522521
retry_on_failure: true
523522
type: setup
@@ -530,7 +529,6 @@ functions:
530529
IMAGE_NAME: ${IMAGE_NAME}
531530

532531
pipeline_agent:
533-
- *switch_context
534532
- command: subprocess.exec
535533
retry_on_failure: true
536534
type: setup
@@ -543,7 +541,6 @@ functions:
543541
FLAGS: ${FLAGS}
544542

545543
pipeline_ops_manager:
546-
- *switch_context
547544
- command: subprocess.exec
548545
retry_on_failure: true
549546
type: setup
@@ -554,7 +551,6 @@ functions:
554551
binary: scripts/release/pipeline_ops_manager.sh
555552

556553
pipeline_readiness_probe:
557-
- *switch_context
558554
- command: subprocess.exec
559555
retry_on_failure: true
560556
type: setup
@@ -565,7 +561,6 @@ functions:
565561
binary: scripts/release/pipeline_readiness_probe.sh
566562

567563
pipeline_version_upgrade_hook:
568-
- *switch_context
569564
- command: subprocess.exec
570565
retry_on_failure: true
571566
type: setup
@@ -576,7 +571,6 @@ functions:
576571
binary: scripts/release/pipeline_version_upgrade_hook.sh
577572

578573
teardown_cloud_qa_all:
579-
- *switch_context
580574
- command: shell.exec
581575
type: setup
582576
params:
@@ -732,7 +726,6 @@ functions:
732726
make sbom-tests
733727
734728
generate_perf_tests_tasks:
735-
- *switch_context
736729
- command: shell.exec
737730
type: setup
738731
params:
@@ -817,7 +810,6 @@ functions:
817810

818811
# it executes a script by convention: ./scripts/code_snippets/tests/${task_name}
819812
test_code_snippets:
820-
- *switch_context
821813
- command: shell.exec
822814
params:
823815
shell: bash

.evergreen-snippets.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variables:
66
- func: setup_gcloud_cli
77
- func: setup_mongosh
88
- func: download_kube_tools
9+
- func: switch_context
910
- func: build_multi_cluster_binary
1011
teardown_task:
1112
- func: upload_e2e_logs
@@ -20,6 +21,7 @@ variables:
2021
- func: cleanup_exec_environment
2122
- func: download_kube_tools
2223
- func: configure_docker_auth
24+
- func: switch_context
2325
- func: setup_kubernetes_environment
2426
- func: python_venv
2527
- func: setup_cloud_qa

.evergreen-tasks.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ tasks:
6060
vars:
6161
image_name: mongodb-agent
6262

63-
- name: preflight_om_image
64-
tags: [ "image_preflight" ]
65-
commands:
66-
- func: clone
67-
- func: python_venv
68-
- func: setup_preflight
69-
- func: preflight_image
70-
vars:
71-
image_name: ops-manager
72-
7363
# Code snippets tasks
7464
# Each task is selected by convention by running scripts/code_snippets/${task_name}_test.sh
7565
- name: task_gke_multi_cluster_snippets
@@ -1318,4 +1308,3 @@ tasks:
13181308
tags: [ "patch-run" ]
13191309
commands:
13201310
- func: "e2e_test"
1321-

0 commit comments

Comments
 (0)