@@ -13,7 +13,7 @@ include:
1313variables :
1414 - &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change
1515
16- - &ops_manager_70_latest 7.0.20 # The order/index is important, since these are anchors. Please do not change
16+ - &ops_manager_70_latest 7.0.19 # The order/index is important, since these are anchors. Please do not change
1717
1818 - &ops_manager_80_latest 8.0.17 # The order/index is important, since these are anchors. Please do not change
1919
@@ -287,21 +287,19 @@ tasks:
287287 commands :
288288 - func : lint_repo
289289
290- # Runs on every merge - detects release.json changes and releases appropriate images
291- - name : release_om_and_agents
292- allowed_requesters : [ "patch" , "commit"]
290+ # pct only triggers this variant once a new agent image is out
291+ - name : release_agent
292+ # this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
293+ allowed_requesters : [ "patch", "github_pr" ]
293294 commands :
294295 - func : clone
295- - func : python_venv
296296 - func : setup_building_host
297297 - func : quay_login
298298 - func : setup_docker_sbom
299- - command : subprocess.exec
300- params :
301- working_dir : src/github.com/mongodb/mongodb-kubernetes
302- binary : scripts/dev/run_python.sh
303- args :
304- - scripts/release/release_om_and_agents.py
299+ - func : pipeline
300+ vars :
301+ image_name : agent
302+ build_scenario : release
305303
306304 - name : migrate_all_agents
307305 # this enables us to run this variant manually to build all the agents for the new agent registry
@@ -345,9 +343,8 @@ tasks:
345343 - func : quay_login
346344 - func : pipeline
347345 vars :
348- agent_version : all
349346 image_name : agent
350- flags : " --parallel --skip-if-exists=false"
347+ flags : " --parallel --all-agents -- skip-if-exists=false"
351348
352349 - name : rebuild_currently_used_agents
353350 # this enables us to run this manually (patch) and rebuild current agent versions to verify
@@ -359,9 +356,8 @@ tasks:
359356 - func : quay_login
360357 - func : pipeline
361358 vars :
362- agent_version : current
363359 image_name : agent
364- flags : " --parallel --skip-if-exists=false"
360+ flags : " --parallel --current-agents -- skip-if-exists=false"
365361
366362 - name : build_kubectl_mongodb_plugin
367363 commands :
@@ -467,8 +463,7 @@ tasks:
467463 - func : pipeline
468464 vars :
469465 image_name : agent
470- agent_version : all
471- flags : " --parallel"
466+ flags : " --parallel --all-agents"
472467
473468 - name : build_init_database_image_ubi
474469 commands :
@@ -1898,6 +1893,26 @@ buildvariants:
18981893 tasks :
18991894 - name : build_om_images
19001895
1896+ # It will be called by pct while bumping the agent cloud manager image
1897+ - name : release_agent
1898+ display_name : release_agent
1899+ tags : [ "manual_patch", "release_agent" ]
1900+ run_on :
1901+ - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1902+ depends_on :
1903+ - variant : init_test_run
1904+ name : build_agent_images_ubi # this ensures the agent gets released to ECR as well
1905+ - variant : e2e_multi_cluster_kind
1906+ name : ' *'
1907+ - variant : e2e_static_multi_cluster_2_clusters
1908+ name : ' *'
1909+ - variant : e2e_mdb_kind_ubi_cloudqa
1910+ name : ' *'
1911+ - variant : e2e_static_mdb_kind_ubi_cloudqa
1912+ name : ' *'
1913+ tasks :
1914+ - name : release_agent
1915+
19011916 # Only called manually, It's used for testing the task release_agents in case the release.json
19021917 # has not changed, and you still want to push the images to registry.
19031918 - name : manual_release_all_agents
@@ -1931,6 +1946,51 @@ buildvariants:
19311946 - name : backup_csv_images_limit_3
19321947 - name : backup_csv_images_all
19331948
1949+ - name : publish_om60_images
1950+ display_name : publish_om60_images
1951+ tags : [ "manual_patch" ]
1952+ allowed_requesters : [ "patch", "github_pr" ]
1953+ run_on :
1954+ - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1955+ depends_on :
1956+ - variant : e2e_om60_kind_ubi
1957+ name : ' *'
1958+ - variant : e2e_static_om60_kind_ubi
1959+ name : ' *'
1960+ tasks :
1961+ - name : publish_ops_manager
1962+ - name : release_agent
1963+
1964+ - name : publish_om70_images
1965+ display_name : publish_om70_images
1966+ tags : [ "manual_patch" ]
1967+ allowed_requesters : [ "patch", "github_pr" ]
1968+ run_on :
1969+ - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1970+ depends_on :
1971+ - variant : e2e_om70_kind_ubi
1972+ name : ' *'
1973+ - variant : e2e_static_om70_kind_ubi
1974+ name : ' *'
1975+ tasks :
1976+ - name : publish_ops_manager
1977+ - name : release_agent
1978+
1979+ - name : publish_om80_images
1980+ display_name : publish_om80_images
1981+ tags : [ "manual_patch" ]
1982+ allowed_requesters : [ "patch", "github_pr" ]
1983+ run_on :
1984+ - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1985+ depends_on :
1986+ - variant : e2e_om80_kind_ubi
1987+ name : ' *'
1988+ - variant : e2e_static_om80_kind_ubi
1989+ name : ' *'
1990+ tasks :
1991+ - name : publish_ops_manager
1992+ - name : release_agent
1993+
19341994 - name : migrate_all_agents
19351995 display_name : migrate_all_agents
19361996 tags : [ "manual_patch" ]
@@ -1939,13 +1999,3 @@ buildvariants:
19391999 - ubuntu2404-large
19402000 tasks :
19412001 - name : migrate_all_agents
1942-
1943- # Runs on every merge to master and releases images auxiliary to the operator release like OM and the Agent
1944- - name : release_om_and_agents
1945- display_name : release_om_and_agents
1946- allowed_requesters : [ "patch" , "commit"]
1947- run_on :
1948- - release-ubuntu2404-small
1949- patchable : false # Only run on commit builds
1950- tasks :
1951- - name : release_om_and_agents
0 commit comments