Skip to content

Commit 8f50012

Browse files
committed
Merge branch 'master' into e2e-tests-on-published-chart
2 parents 5cb41a0 + 582d248 commit 8f50012

File tree

54 files changed

+918
-388
lines changed

Some content is hidden

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

54 files changed

+918
-388
lines changed

.evergreen-functions.yml

Lines changed: 11 additions & 54 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
@@ -507,12 +510,12 @@ functions:
507510
params:
508511
working_dir: src/github.com/mongodb/mongodb-kubernetes
509512
binary: scripts/release/publish_helm_chart.sh
510-
513+
511514
build_multi_cluster_binary:
512515
- command: subprocess.exec
513516
params:
514517
working_dir: src/github.com/mongodb/mongodb-kubernetes
515-
binary: scripts/dev/run_python.sh scripts/release/kubectl-mongodb/python/build_kubectl_plugin.py
518+
binary: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/build_kubectl_plugin.py
516519

517520
build_and_push_appdb_database:
518521
- command: subprocess.exec
@@ -542,50 +545,9 @@ functions:
542545
working_dir: src/github.com/mongodb/mongodb-kubernetes
543546
binary: scripts/release/pipeline.sh
544547
env:
545-
IMAGE_NAME: ${IMAGE_NAME}
546-
FLAGS: ${FLAGS}
547-
548-
pipeline_agent:
549-
- command: subprocess.exec
550-
retry_on_failure: true
551-
type: setup
552-
params:
553-
shell: bash
554-
<<: *e2e_include_expansions_in_env
555-
working_dir: src/github.com/mongodb/mongodb-kubernetes
556-
binary: scripts/release/pipeline_agent.sh
557-
env:
558-
FLAGS: ${FLAGS}
559-
560-
pipeline_ops_manager:
561-
- command: subprocess.exec
562-
retry_on_failure: true
563-
type: setup
564-
params:
565-
shell: bash
566-
<<: *e2e_include_expansions_in_env
567-
working_dir: src/github.com/mongodb/mongodb-kubernetes
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-
binary: scripts/release/pipeline_readiness_probe.sh
579-
580-
pipeline_version_upgrade_hook:
581-
- command: subprocess.exec
582-
retry_on_failure: true
583-
type: setup
584-
params:
585-
shell: bash
586-
<<: *e2e_include_expansions_in_env
587-
working_dir: src/github.com/mongodb/mongodb-kubernetes
588-
binary: scripts/release/pipeline_version_upgrade_hook.sh
548+
IMAGE_NAME: ${image_name}
549+
BUILD_SCENARIO_OVERRIDE: ${build_scenario}
550+
FLAGS: ${flags}
589551

590552
teardown_cloud_qa_all:
591553
- command: shell.exec
@@ -888,7 +850,7 @@ functions:
888850
release_kubectl_mongodb_plugin:
889851
- command: github.generate_token
890852
params:
891-
expansion_name: generated_token
853+
expansion_name: GH_TOKEN
892854
- command: shell.exec
893855
type: setup
894856
params:
@@ -911,10 +873,5 @@ functions:
911873
GOROOT: "/opt/golang/go1.24"
912874
MACOS_NOTARY_KEY: ${macos_notary_keyid}
913875
MACOS_NOTARY_SECRET: ${macos_notary_secret}
914-
# shell.exec EVG Task doesn't have add_to_path, so we need to explicitly add the path export below.
915-
script: |
916-
set -Eeu pipefail
917-
export GORELEASER_CURRENT_TAG=${OPERATOR_VERSION|*triggered_by_git_tag}
918-
export PATH=$GOROOT/bin:$PATH
919-
export GITHUB_TOKEN=${generated_token}
920-
${workdir}/goreleaser release --clean
876+
GH_TOKEN: ${GH_TOKEN}
877+
script: scripts/dev/run_python.sh scripts/release/kubectl_mongodb/python/promote_kubectl_plugin.py

.evergreen-release.yml

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tasks:
1212
- func: build_multi_cluster_binary
1313
- func: pipeline
1414
vars:
15-
IMAGE_NAME: meko-tests
15+
image_name: meko-tests
1616

1717
- name: release_operator
1818
tags: [ "image_release" ]
@@ -23,7 +23,7 @@ tasks:
2323
- func: quay_login
2424
- func: pipeline
2525
vars:
26-
IMAGE_NAME: operator
26+
image_name: operator
2727

2828
# Releases init images to Quay
2929
- name: release_init_appdb
@@ -35,7 +35,7 @@ tasks:
3535
- func: quay_login
3636
- func: pipeline
3737
vars:
38-
IMAGE_NAME: init-appdb
38+
image_name: init-appdb
3939

4040
- name: release_init_database
4141
tags: [ "image_release" ]
@@ -46,7 +46,7 @@ tasks:
4646
- func: quay_login
4747
- func: pipeline
4848
vars:
49-
IMAGE_NAME: init-database
49+
image_name: init-database
5050

5151
- name: release_init_ops_manager
5252
tags: [ "image_release" ]
@@ -57,7 +57,7 @@ tasks:
5757
- func: quay_login
5858
- func: pipeline
5959
vars:
60-
IMAGE_NAME: init-ops-manager
60+
image_name: init-ops-manager
6161

6262
- name: release_database
6363
tags: [ "image_release" ]
@@ -68,7 +68,7 @@ tasks:
6868
- func: quay_login
6969
- func: pipeline
7070
vars:
71-
IMAGE_NAME: database
71+
image_name: database
7272

7373
- name: release_readiness_probe
7474
tags: [ "image_release" ]
@@ -77,7 +77,9 @@ tasks:
7777
- func: clone
7878
- func: setup_building_host
7979
- func: quay_login
80-
- func: pipeline_readiness_probe
80+
- func: pipeline
81+
vars:
82+
image_name: readiness-probe
8183

8284
- name: release_version_upgrade_hook
8385
tags: [ "image_release" ]
@@ -86,7 +88,9 @@ tasks:
8688
- func: clone
8789
- func: setup_building_host
8890
- func: quay_login
89-
- func: pipeline_version_upgrade_hook
91+
- func: pipeline
92+
vars:
93+
image_name: upgrade-hook
9094

9195
- name: prepare_and_upload_openshift_bundles
9296
tags: [ "openshift_bundles" ]
@@ -121,14 +125,25 @@ tasks:
121125
- func: clone
122126
- func: install_goreleaser
123127
- func: install_macos_notarization_service
128+
- func: python_venv
124129
- func: release_kubectl_mongodb_plugin
125-
130+
126131
- name: create_chart_release_pr
127132
tags: [ "helm_chart_release_pr" ]
128133
commands:
129134
- func: clone
130135
- func: python_venv
131136
- func: create_chart_release_pr
137+
138+
- name: release_chart_to_oci_registry
139+
tags: [ "release_chart_to_oci_registry" ]
140+
commands:
141+
- func: clone
142+
- func: python_venv
143+
- func: setup_kubectl
144+
- func: setup_aws
145+
- func: helm_registry_login
146+
- func: publish_helm_chart
132147

133148
### Release build variants
134149
buildvariants:
@@ -255,3 +270,12 @@ buildvariants:
255270
allowed_requesters: [ "patch", "github_tag" ]
256271
tasks:
257272
- name: create_chart_release_pr
273+
274+
- name: release_chart_to_oci_registry
275+
display_name: release_chart_to_oci_registry
276+
tags: [ "release" ]
277+
run_on:
278+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
279+
allowed_requesters: [ "patch", "github_tag" ]
280+
tasks:
281+
- name: release_chart_to_oci_registry

.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)