Skip to content

Commit eb03573

Browse files
committed
Merge branch 'remove-static-pipeline' into CLOUDP-335393_mdb_agent_image_version_bump
2 parents 717abe1 + 3357e31 commit eb03573

File tree

5 files changed

+397
-301
lines changed

5 files changed

+397
-301
lines changed

.evergreen.yml

Lines changed: 9 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ variables:
3333
variant: init_test_run
3434
- name: build_init_om_images_ubi
3535
variant: init_test_run
36-
- name: build_agent_images_ubi
37-
variant: init_test_run
3836

3937
- &base_no_om_image_dependency
4038
depends_on:
@@ -52,17 +50,14 @@ variables:
5250
variant: init_test_run
5351
- name: build_init_appdb_images_ubi
5452
variant: init_test_run
55-
- name: build_agent_images_ubi
56-
variant: init_test_run
5753

5854
- &community_dependency
5955
depends_on:
6056
- name: build_operator_ubi
6157
variant: init_test_run
6258
- name: build_test_image
6359
variant: init_test_run
64-
- name: build_agent_images_ubi
65-
variant: init_test_run
60+
6661
- name: build_readiness_probe_image
6762
variant: init_test_run
6863
- name: build_upgrade_hook_image
@@ -153,8 +148,6 @@ variables:
153148
variant: init_test_run
154149
- name: build_init_om_images_ubi
155150
variant: init_test_run
156-
- name: build_agent_images_ubi
157-
variant: init_test_run
158151

159152
- &base_om7_dependency_with_race
160153
depends_on:
@@ -172,8 +165,6 @@ variables:
172165
variant: init_test_run
173166
- name: build_init_om_images_ubi
174167
variant: init_test_run
175-
- name: build_agent_images_ubi
176-
variant: init_test_run
177168

178169
- &base_om8_dependency
179170
depends_on:
@@ -191,8 +182,7 @@ variables:
191182
variant: init_test_run
192183
- name: build_init_om_images_ubi
193184
variant: init_test_run
194-
- name: build_agent_images_ubi
195-
variant: init_test_run
185+
196186

197187
parameters:
198188
- key: evergreen_retry
@@ -347,19 +337,6 @@ tasks:
347337
image_name: init-ops-manager
348338
include_tags: release
349339

350-
- name: release_agent_operator_release
351-
tags: [ "image_release" ]
352-
allowed_requesters: [ "patch", "github_tag" ]
353-
commands:
354-
- func: clone
355-
- func: setup_building_host
356-
- func: quay_login
357-
- func: setup_docker_sbom
358-
- func: legacy_pipeline
359-
vars:
360-
image_name: agent
361-
include_tags: release
362-
363340
# pct only triggers this variant once a new agent image is out
364341
- name: release_agent
365342
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
@@ -392,21 +369,6 @@ tasks:
392369
working_dir: src/github.com/mongodb/mongodb-kubernetes
393370
binary: scripts/evergreen/precommit_bump.sh
394371

395-
# Pct only triggers this variant once a new agent image is out
396-
# these releases the agent with the operator suffix (not patch id) on ecr to allow for digest pinning to pass.
397-
# For this to work, we rely on skip_tags which is used to determine whether
398-
# we want to release on quay or not, in this case - ecr instead.
399-
# We rely on the init_database from ecr for the agent x operator images.
400-
# This runs on agent releases that are not concurrent with operator releases.
401-
- name: release_agents_on_ecr_conditional
402-
commands:
403-
- func: clone
404-
- func: run_task_conditionally
405-
vars:
406-
condition_script: scripts/evergreen/should_release_agents_on_ecr.sh
407-
variant: init_release_agents_on_ecr
408-
task: release_agents_on_ecr
409-
410372
- name: release_agents_on_ecr
411373
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
412374
allowed_requesters: [ "patch", "github_pr" ]
@@ -1334,8 +1296,7 @@ buildvariants:
13341296
variant: init_test_run
13351297
- name: build_init_database_image_ubi
13361298
variant: init_test_run
1337-
- name: build_agent_images_ubi
1338-
variant: init_test_run
1299+
13391300
tasks:
13401301
- name: e2e_custom_domain_task_group
13411302

@@ -1369,8 +1330,7 @@ buildvariants:
13691330
variant: init_test_run
13701331
- name: build_init_database_image_ubi
13711332
variant: init_test_run
1372-
- name: build_agent_images_ubi
1373-
variant: init_test_run
1333+
13741334
run_on:
13751335
- ubuntu2204-small
13761336
tasks:
@@ -1617,8 +1577,7 @@ buildvariants:
16171577
variant: init_tests_with_olm
16181578
- name: build_init_database_image_ubi
16191579
variant: init_test_run
1620-
- name: build_agent_images_ubi
1621-
variant: init_test_run
1580+
16221581
tasks:
16231582
- name: e2e_kind_olm_group
16241583

@@ -1683,18 +1642,6 @@ buildvariants:
16831642
- name: build_upgrade_hook_image
16841643
- name: prepare_aws
16851644

1686-
- name: init_release_agents_on_ecr
1687-
display_name: init_release_agents_on_ecr
1688-
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
1689-
allowed_requesters: [ "patch", "github_pr" ]
1690-
tags: [ "release_agents_on_ecr" ]
1691-
# We want that to run first and finish asap. Digest pinning depends on this to succeed.
1692-
priority: 70
1693-
run_on:
1694-
- ubuntu2204-large
1695-
tasks:
1696-
- name: release_agents_on_ecr_conditional
1697-
16981645
- name: run_pre_commit
16991646
priority: 70
17001647
display_name: run_pre_commit
@@ -1722,8 +1669,7 @@ buildvariants:
17221669
variant: init_test_run
17231670
- name: build_init_om_images_ubi
17241671
variant: init_test_run
1725-
- name: build_agent_images_ubi
1726-
variant: init_test_run
1672+
17271673
run_on:
17281674
- ubuntu2204-small
17291675
tasks:
@@ -1809,13 +1755,6 @@ buildvariants:
18091755
- name: release_init_database
18101756
- name: release_init_ops_manager
18111757
- name: release_database
1812-
# Once we release the operator, we will also release the init databases, we require them to be out first
1813-
# such that we can reference them and retrieve those binaries.
1814-
# Since we immediately run daily rebuild after creating the image, we can ensure that the init_database is out
1815-
# such that the agent image build can use it.
1816-
- name: release_agent_operator_release
1817-
depends_on:
1818-
- name: release_init_database
18191758

18201759
- name: preflight_release_images
18211760
display_name: preflight_release_images
@@ -1847,13 +1786,13 @@ buildvariants:
18471786

18481787
# It will be called by pct while bumping the agent cloud manager image
18491788
- name: release_agent
1850-
display_name: (Static Containers) Release Agent matrix
1789+
display_name: release_agent
18511790
tags: [ "release_agent" ]
18521791
run_on:
18531792
- release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
18541793
depends_on:
1855-
- variant: init_release_agents_on_ecr
1856-
name: '*'
1794+
- variant: init_test_run
1795+
name: build_agent_images_ubi # this ensures the agent gets released to ECR as well
18571796
- variant: e2e_multi_cluster_kind
18581797
name: '*'
18591798
- variant: e2e_static_multi_cluster_2_clusters

0 commit comments

Comments
 (0)