Skip to content

Commit d95b296

Browse files
committed
removing pipeline and atomic matrix
1 parent 0786a90 commit d95b296

File tree

5 files changed

+407
-295
lines changed

5 files changed

+407
-295
lines changed

.evergreen.yml

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ 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
36+
3837

3938
- &base_no_om_image_dependency
4039
depends_on:
@@ -52,17 +51,15 @@ variables:
5251
variant: init_test_run
5352
- name: build_init_appdb_images_ubi
5453
variant: init_test_run
55-
- name: build_agent_images_ubi
56-
variant: init_test_run
54+
5755

5856
- &community_dependency
5957
depends_on:
6058
- name: build_operator_ubi
6159
variant: init_test_run
6260
- name: build_test_image
6361
variant: init_test_run
64-
- name: build_agent_images_ubi
65-
variant: init_test_run
62+
6663
- name: build_readiness_probe_image
6764
variant: init_test_run
6865
- name: build_upgrade_hook_image
@@ -153,8 +150,7 @@ variables:
153150
variant: init_test_run
154151
- name: build_init_om_images_ubi
155152
variant: init_test_run
156-
- name: build_agent_images_ubi
157-
variant: init_test_run
153+
158154

159155
- &base_om7_dependency_with_race
160156
depends_on:
@@ -172,8 +168,7 @@ variables:
172168
variant: init_test_run
173169
- name: build_init_om_images_ubi
174170
variant: init_test_run
175-
- name: build_agent_images_ubi
176-
variant: init_test_run
171+
177172

178173
- &base_om8_dependency
179174
depends_on:
@@ -191,8 +186,7 @@ variables:
191186
variant: init_test_run
192187
- name: build_init_om_images_ubi
193188
variant: init_test_run
194-
- name: build_agent_images_ubi
195-
variant: init_test_run
189+
196190

197191
parameters:
198192
- key: evergreen_retry
@@ -347,19 +341,6 @@ tasks:
347341
image_name: init-ops-manager
348342
include_tags: release
349343

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-
363344
# pct only triggers this variant once a new agent image is out
364345
- name: release_agent
365346
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
@@ -392,21 +373,6 @@ tasks:
392373
working_dir: src/github.com/mongodb/mongodb-kubernetes
393374
binary: scripts/evergreen/precommit_bump.sh
394375

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-
410376
- name: release_agents_on_ecr
411377
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
412378
allowed_requesters: [ "patch", "github_pr" ]
@@ -1334,8 +1300,7 @@ buildvariants:
13341300
variant: init_test_run
13351301
- name: build_init_database_image_ubi
13361302
variant: init_test_run
1337-
- name: build_agent_images_ubi
1338-
variant: init_test_run
1303+
13391304
tasks:
13401305
- name: e2e_custom_domain_task_group
13411306

@@ -1369,8 +1334,7 @@ buildvariants:
13691334
variant: init_test_run
13701335
- name: build_init_database_image_ubi
13711336
variant: init_test_run
1372-
- name: build_agent_images_ubi
1373-
variant: init_test_run
1337+
13741338
run_on:
13751339
- ubuntu2204-small
13761340
tasks:
@@ -1617,8 +1581,7 @@ buildvariants:
16171581
variant: init_tests_with_olm
16181582
- name: build_init_database_image_ubi
16191583
variant: init_test_run
1620-
- name: build_agent_images_ubi
1621-
variant: init_test_run
1584+
16221585
tasks:
16231586
- name: e2e_kind_olm_group
16241587

@@ -1683,18 +1646,6 @@ buildvariants:
16831646
- name: build_upgrade_hook_image
16841647
- name: prepare_aws
16851648

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-
16981649
- name: run_pre_commit
16991650
priority: 70
17001651
display_name: run_pre_commit
@@ -1722,8 +1673,7 @@ buildvariants:
17221673
variant: init_test_run
17231674
- name: build_init_om_images_ubi
17241675
variant: init_test_run
1725-
- name: build_agent_images_ubi
1726-
variant: init_test_run
1676+
17271677
run_on:
17281678
- ubuntu2204-small
17291679
tasks:
@@ -1809,13 +1759,6 @@ buildvariants:
18091759
- name: release_init_database
18101760
- name: release_init_ops_manager
18111761
- 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
18191762

18201763
- name: preflight_release_images
18211764
display_name: preflight_release_images
@@ -1847,13 +1790,13 @@ buildvariants:
18471790

18481791
# It will be called by pct while bumping the agent cloud manager image
18491792
- name: release_agent
1850-
display_name: (Static Containers) Release Agent matrix
1793+
display_name: release_agent
18511794
tags: [ "release_agent" ]
18521795
run_on:
18531796
- release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
18541797
depends_on:
1855-
- variant: init_release_agents_on_ecr
1856-
name: '*'
1798+
- variant: init_test_run
1799+
name: build_agent_images_ubi # this ensures the agent gets released to ECR as well
18571800
- variant: e2e_multi_cluster_kind
18581801
name: '*'
18591802
- variant: e2e_static_multi_cluster_2_clusters

0 commit comments

Comments
 (0)