Skip to content

Commit e800ca8

Browse files
authored
CLOUDP-364442 - remove om6 testing infra (#637)
# Summary - This PR drops om6 testing infra from evg - OM6 is EOL since January 31, 2025 - OM6 support has officially been dropped since 1.31.x ## Proof of Work - green patch without om6 (normal patches): - manually you can still trigger om6: [patch](https://spruce.mongodb.com/version/6938247ef405a0000774a8b3/tasks?sorts=STATUS%3AASC%3BBASE_STATUS%3ADESC) ## Checklist - [x] Have you linked a jira ticket and/or is the ticket in the title? - [x] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details
1 parent 72450b5 commit e800ca8

File tree

4 files changed

+45
-21
lines changed

4 files changed

+45
-21
lines changed

.evergreen.yml

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,10 +1374,10 @@ buildvariants:
13741374

13751375
## Ops Manager build variants
13761376

1377-
# Isolated Ops Manager Tests for 6.0 version
1377+
# Isolated Ops Manager Tests for 6.0 version - kept for on-demand testing only
13781378
- name: e2e_om60_kind_ubi
13791379
display_name: e2e_om60_kind_ubi
1380-
tags: [ "pr_patch", "staging", "e2e_test_suite" ]
1380+
tags: [ "manual_patch", "e2e_test_suite" ]
13811381
run_on:
13821382
- ubuntu2204-medium-high-memory
13831383
<<: *base_om6_dependency
@@ -1386,10 +1386,10 @@ buildvariants:
13861386
- name: e2e_ops_manager_kind_5_0_only_task_group
13871387
- name: e2e_ops_manager_kind_6_0_only_task_group
13881388

1389-
# Isolated Ops Manager Tests for 6.0 version
1389+
# Isolated Ops Manager Tests for 6.0 version - kept for on-demand testing only
13901390
- name: e2e_static_om60_kind_ubi
13911391
display_name: e2e_static_om60_kind_ubi
1392-
tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
1392+
tags: [ "manual_patch", "e2e_test_suite", "static" ]
13931393
run_on:
13941394
- ubuntu2404-large
13951395
<<: *base_om6_dependency
@@ -1585,7 +1585,7 @@ buildvariants:
15851585
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
15861586
run_on:
15871587
- ubuntu2404-large
1588-
<<: *base_om6_dependency
1588+
<<: *base_om7_dependency
15891589
tasks:
15901590
- name: e2e_multi_cluster_kind_task_group
15911591

@@ -1594,7 +1594,7 @@ buildvariants:
15941594
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
15951595
run_on:
15961596
- ubuntu2404-large
1597-
<<: *base_om6_dependency
1597+
<<: *base_om7_dependency
15981598
tasks:
15991599
- name: e2e_multi_cluster_kind_task_group
16001600

@@ -1603,7 +1603,7 @@ buildvariants:
16031603
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
16041604
run_on:
16051605
- ubuntu2404-large
1606-
<<: *base_om6_dependency
1606+
<<: *base_om7_dependency
16071607
tasks:
16081608
- name: e2e_multi_cluster_2_clusters_task_group
16091609

@@ -1612,7 +1612,7 @@ buildvariants:
16121612
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
16131613
run_on:
16141614
- ubuntu2404-large
1615-
<<: *base_om6_dependency
1615+
<<: *base_om7_dependency
16161616
tasks:
16171617
- name: e2e_multi_cluster_2_clusters_task_group
16181618

@@ -1621,7 +1621,7 @@ buildvariants:
16211621
tags: [ "pr_patch", "staging", "e2e_test_suite" ]
16221622
run_on:
16231623
- ubuntu2404-large
1624-
<<: *base_om6_dependency
1624+
<<: *base_om7_dependency
16251625
tasks:
16261626
- name: e2e_multi_cluster_om_appdb_task_group
16271627

@@ -1630,7 +1630,7 @@ buildvariants:
16301630
tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
16311631
run_on:
16321632
- ubuntu2404-large
1633-
<<: *base_om6_dependency
1633+
<<: *base_om7_dependency
16341634
tasks:
16351635
- name: e2e_static_multi_cluster_om_appdb_task_group
16361636

@@ -1678,8 +1678,6 @@ buildvariants:
16781678
run_on:
16791679
- ubuntu2404-large
16801680
depends_on:
1681-
- name: build_om_images
1682-
variant: build_om60_images
16831681
- name: build_operator_ubi
16841682
variant: init_test_run
16851683
- name: build_test_image
@@ -1703,8 +1701,6 @@ buildvariants:
17031701
run_on:
17041702
- ubuntu2404-large
17051703
depends_on:
1706-
- name: build_om_images
1707-
variant: build_om60_images
17081704
- name: build_operator_ubi
17091705
variant: init_test_run
17101706
- name: build_test_image
@@ -1840,8 +1836,6 @@ buildvariants:
18401836
- name: init_tests_with_olm
18411837
display_name: init_tests_with_olm
18421838
depends_on:
1843-
- name: build_om_images
1844-
variant: build_om60_images
18451839
- name: build_operator_ubi
18461840
variant: init_test_run
18471841
- name: build_init_database_image_ubi
@@ -1874,9 +1868,10 @@ buildvariants:
18741868
tasks:
18751869
- name: preflight_images_task_group
18761870

1871+
# OM60 images build - kept for on-demand testing only
18771872
- name: build_om60_images
18781873
display_name: build_om60_images
1879-
tags: [ "pr_patch", "staging" ]
1874+
tags: [ "manual_patch" ]
18801875
run_on:
18811876
- ubuntu2404-small
18821877
tasks:
@@ -1931,6 +1926,36 @@ buildvariants:
19311926
- name: backup_csv_images_limit_3
19321927
- name: backup_csv_images_all
19331928

1929+
- name: publish_om70_images
1930+
display_name: publish_om70_images
1931+
tags: [ "manual_patch" ]
1932+
allowed_requesters: [ "patch", "github_pr" ]
1933+
run_on:
1934+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1935+
depends_on:
1936+
- variant: e2e_om70_kind_ubi
1937+
name: '*'
1938+
- variant: e2e_static_om70_kind_ubi
1939+
name: '*'
1940+
tasks:
1941+
- name: publish_ops_manager
1942+
- name: release_agent
1943+
1944+
- name: publish_om80_images
1945+
display_name: publish_om80_images
1946+
tags: [ "manual_patch" ]
1947+
allowed_requesters: [ "patch", "github_pr" ]
1948+
run_on:
1949+
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
1950+
depends_on:
1951+
- variant: e2e_om80_kind_ubi
1952+
name: '*'
1953+
- variant: e2e_static_om80_kind_ubi
1954+
name: '*'
1955+
tasks:
1956+
- name: publish_ops_manager
1957+
- name: release_agent
1958+
19341959
- name: migrate_all_agents
19351960
display_name: migrate_all_agents
19361961
tags: [ "manual_patch" ]

scripts/dev/contexts/variables/om60

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -Eeou pipefail
44

55
CUSTOM_OM_PREV_VERSION=6.0.0
66
export CUSTOM_OM_PREV_VERSION
7-
CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_60_latest\s+(\S+)\s+#" <"${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}')
7+
CUSTOM_OM_VERSION=6.0.27
88
export CUSTOM_OM_VERSION
99

1010
export CUSTOM_MDB_VERSION=6.0.21

scripts/dev/contexts/variables/om60_image

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22

33
set -Eeou pipefail
44

5-
6-
OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_60_latest\s+(\S+)\s+#" < "${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}')
5+
OM_VERSION=6.0.27
76
export OM_VERSION

scripts/dev/contexts/variables/om70

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -Eeou pipefail
44

5-
CUSTOM_OM_PREV_VERSION=$(grep -E "^\s*-\s*&ops_manager_60_latest\s+(\S+)\s+#" <"${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}')
5+
CUSTOM_OM_PREV_VERSION=6.0.27
66
export CUSTOM_OM_PREV_VERSION
77
CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}')
88
export CUSTOM_OM_VERSION

0 commit comments

Comments
 (0)