Skip to content

Commit 174f762

Browse files
committed
Merge branch 'master' into maciejk/ar-image-release-smoke-tests
# Conflicts: # .evergreen-functions.yml # .evergreen-release.yml # .evergreen.yml # scripts/release/argparse_utils.py # scripts/release/build/build_info.py # scripts/release/pipeline.py
2 parents 2070f94 + 8a156c9 commit 174f762

File tree

70 files changed

+1292
-930
lines changed

Some content is hidden

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

70 files changed

+1292
-930
lines changed

.evergreen-functions.yml

Lines changed: 16 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ functions:
227227
type: setup
228228
params:
229229
working_dir: src/github.com/mongodb/mongodb-kubernetes
230+
include_expansions_in_env:
231+
- quay_prod_username
232+
- quay_prod_robot_token
230233
add_to_path:
231234
- ${workdir}/bin
232235
- ${PROJECT_DIR}/bin
@@ -510,38 +513,20 @@ functions:
510513
params:
511514
working_dir: src/github.com/mongodb/mongodb-kubernetes
512515
binary: scripts/release/publish_helm_chart.sh
513-
516+
514517
build_multi_cluster_binary:
515518
- command: subprocess.exec
516519
params:
517520
working_dir: src/github.com/mongodb/mongodb-kubernetes
518-
binary: scripts/dev/run_python.sh scripts/release/kubectl-mongodb/python/build_kubectl_plugin.py
519-
520-
build_and_push_appdb_database:
521-
- command: subprocess.exec
522-
params:
523-
working_dir: src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-appdb-database
524-
binary: ./build_and_push_appdb_database_images.sh
525-
add_to_path:
526-
- ${workdir}/bin
527-
- ${workdir}
521+
binary: scripts/release/kubectl_mongodb/build_kubectl_plugin.sh
528522

529-
pipeline:
523+
download_multi_cluster_binary:
530524
- command: subprocess.exec
531-
retry_on_failure: true
532-
type: setup
533525
params:
534-
shell: bash
535-
<<: *e2e_include_expansions_in_env
536526
working_dir: src/github.com/mongodb/mongodb-kubernetes
537-
add_to_path:
538-
- ${workdir}/bin
539-
binary: scripts/release/pipeline.sh
540-
env:
541-
IMAGE_NAME: ${IMAGE_NAME}
542-
FLAGS: ${FLAGS}
527+
binary: scripts/release/kubectl_mongodb/download_kubectl_plugin.sh
543528

544-
pipeline_agent:
529+
pipeline:
545530
- command: subprocess.exec
546531
retry_on_failure: true
547532
type: setup
@@ -551,45 +536,11 @@ functions:
551536
working_dir: src/github.com/mongodb/mongodb-kubernetes
552537
add_to_path:
553538
- ${workdir}/bin
554-
binary: scripts/release/pipeline_agent.sh
539+
binary: scripts/release/pipeline.sh
555540
env:
556-
FLAGS: ${FLAGS}
557-
558-
pipeline_ops_manager:
559-
- command: subprocess.exec
560-
retry_on_failure: true
561-
type: setup
562-
params:
563-
shell: bash
564-
<<: *e2e_include_expansions_in_env
565-
working_dir: src/github.com/mongodb/mongodb-kubernetes
566-
add_to_path:
567-
- ${workdir}/bin
568-
binary: scripts/release/pipeline_ops_manager.sh
569-
570-
pipeline_readiness_probe:
571-
- command: subprocess.exec
572-
retry_on_failure: true
573-
type: setup
574-
params:
575-
shell: bash
576-
<<: *e2e_include_expansions_in_env
577-
working_dir: src/github.com/mongodb/mongodb-kubernetes
578-
add_to_path:
579-
- ${workdir}/bin
580-
binary: scripts/release/pipeline_readiness_probe.sh
581-
582-
pipeline_version_upgrade_hook:
583-
- command: subprocess.exec
584-
retry_on_failure: true
585-
type: setup
586-
params:
587-
shell: bash
588-
<<: *e2e_include_expansions_in_env
589-
working_dir: src/github.com/mongodb/mongodb-kubernetes
590-
add_to_path:
591-
- ${workdir}/bin
592-
binary: scripts/release/pipeline_version_upgrade_hook.sh
541+
IMAGE_NAME: ${image_name}
542+
BUILD_SCENARIO_OVERRIDE: ${build_scenario}
543+
FLAGS: ${flags}
593544

594545
teardown_cloud_qa_all:
595546
- command: shell.exec
@@ -843,22 +794,6 @@ functions:
843794
script: |
844795
./scripts/code_snippets/tests/${task_name}
845796
846-
#
847-
# kubectl mongodb plugin release functions
848-
#
849-
install_goreleaser:
850-
- command: shell.exec
851-
type: setup
852-
include_expansions_in_env:
853-
- goreleaser_pro_tar_gz
854-
params:
855-
script: |
856-
set -Eeu pipefail
857-
curl -fL "${goreleaser_pro_tar_gz}" --output goreleaser_Linux_x86_64.tar.gz
858-
tar -xf goreleaser_Linux_x86_64.tar.gz
859-
chmod 755 ./goreleaser
860-
sudo cp goreleaser /usr/local/bin/
861-
862797
install_macos_notarization_service:
863798
- command: shell.exec
864799
type: setup
@@ -892,8 +827,8 @@ functions:
892827
release_kubectl_mongodb_plugin:
893828
- command: github.generate_token
894829
params:
895-
expansion_name: generated_token
896-
- command: shell.exec
830+
expansion_name: GH_TOKEN
831+
- command: subprocess.exec
897832
type: setup
898833
params:
899834
working_dir: src/github.com/mongodb/mongodb-kubernetes
@@ -910,15 +845,7 @@ functions:
910845
- triggered_by_git_tag
911846
- OPERATOR_VERSION
912847
env:
913-
XDG_CONFIG_HOME: ${go_base_path}${workdir}
914-
GO111MODULE: "on"
915-
GOROOT: "/opt/golang/go1.24"
916848
MACOS_NOTARY_KEY: ${macos_notary_keyid}
917849
MACOS_NOTARY_SECRET: ${macos_notary_secret}
918-
# shell.exec EVG Task doesn't have add_to_path, so we need to explicitly add the path export below.
919-
script: |
920-
set -Eeu pipefail
921-
export GORELEASER_CURRENT_TAG=${OPERATOR_VERSION|*triggered_by_git_tag}
922-
export PATH=$GOROOT/bin:$PATH
923-
export GITHUB_TOKEN=${generated_token}
924-
${workdir}/goreleaser release --clean
850+
GH_TOKEN: ${GH_TOKEN}
851+
binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/promote_kubectl_plugin.py

.evergreen-release.yml

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks:
1111
- func: quay_login
1212
- func: pipeline
1313
vars:
14-
IMAGE_NAME: operator
14+
image_name: operator
1515

1616
# Releases init images to Quay
1717
- name: release_init_appdb
@@ -23,7 +23,7 @@ tasks:
2323
- func: quay_login
2424
- func: pipeline
2525
vars:
26-
IMAGE_NAME: init-appdb
26+
image_name: init-appdb
2727

2828
- name: release_init_database
2929
tags: [ "image_release" ]
@@ -34,7 +34,7 @@ tasks:
3434
- func: quay_login
3535
- func: pipeline
3636
vars:
37-
IMAGE_NAME: init-database
37+
image_name: init-database
3838

3939
- name: release_init_ops_manager
4040
tags: [ "image_release" ]
@@ -45,7 +45,7 @@ tasks:
4545
- func: quay_login
4646
- func: pipeline
4747
vars:
48-
IMAGE_NAME: init-ops-manager
48+
image_name: init-ops-manager
4949

5050
- name: release_database
5151
tags: [ "image_release" ]
@@ -56,7 +56,7 @@ tasks:
5656
- func: quay_login
5757
- func: pipeline
5858
vars:
59-
IMAGE_NAME: database
59+
image_name: database
6060

6161
- name: release_readiness_probe
6262
tags: [ "image_release" ]
@@ -65,7 +65,9 @@ tasks:
6565
- func: clone
6666
- func: setup_building_host
6767
- func: quay_login
68-
- func: pipeline_readiness_probe
68+
- func: pipeline
69+
vars:
70+
image_name: readiness-probe
6971

7072
- name: release_version_upgrade_hook
7173
tags: [ "image_release" ]
@@ -74,7 +76,9 @@ tasks:
7476
- func: clone
7577
- func: setup_building_host
7678
- func: quay_login
77-
- func: pipeline_version_upgrade_hook
79+
- func: pipeline
80+
vars:
81+
image_name: upgrade-hook
7882

7983
- name: prepare_and_upload_openshift_bundles
8084
tags: [ "openshift_bundles" ]
@@ -107,7 +111,7 @@ tasks:
107111
allowed_requesters: [ "patch", "github_tag" ]
108112
commands:
109113
- func: clone
110-
- func: install_goreleaser
114+
- func: python_venv
111115
- func: install_macos_notarization_service
112116
- func: release_kubectl_mongodb_plugin
113117

@@ -118,6 +122,16 @@ tasks:
118122
- func: python_venv
119123
- func: create_chart_release_pr
120124

125+
- name: release_chart_to_oci_registry
126+
tags: [ "release_chart_to_oci_registry" ]
127+
commands:
128+
- func: clone
129+
- func: python_venv
130+
- func: setup_kubectl
131+
- func: setup_aws
132+
- func: helm_registry_login
133+
- func: publish_helm_chart
134+
121135
### Release build variants
122136
buildvariants:
123137

@@ -228,8 +242,11 @@ buildvariants:
228242
max_hosts: -1
229243
tags: [ "release", "e2e_smoke_release_test_suite" ]
230244
run_on:
231-
- release-ubuntu2204-arm64-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
245+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
232246
allowed_requesters: [ "patch", "github_tag" ]
247+
depends_on:
248+
- name: release_kubectl_mongodb_plugin
249+
variant: release_kubectl_mongodb_plugin
233250
tasks:
234251
- name: build_test_image_arm
235252

@@ -368,3 +385,12 @@ buildvariants:
368385
allowed_requesters: [ "patch", "github_tag" ]
369386
tasks:
370387
- name: create_chart_release_pr
388+
389+
- name: release_chart_to_oci_registry
390+
display_name: release_chart_to_oci_registry
391+
tags: [ "release" ]
392+
run_on:
393+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
394+
allowed_requesters: [ "patch", "github_tag" ]
395+
tasks:
396+
- name: release_chart_to_oci_registry

.evergreen-snippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77
- func: setup_mongosh
88
- func: download_kube_tools
99
- func: switch_context
10-
- func: build_multi_cluster_binary
10+
- func: download_multi_cluster_binary
1111
teardown_task:
1212
- func: upload_e2e_logs
1313
- func: upload_code_snippets_logs

.evergreen-tasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ tasks:
502502
commands:
503503
- func: "e2e_test"
504504

505-
- name: e2e_disable_tls_scale_up
505+
- name: e2e_disable_tls_and_scale
506506
tags: [ "patch-run" ]
507507
commands:
508508
- func: "e2e_test"

0 commit comments

Comments
 (0)