Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 42 additions & 17 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1374,10 +1374,10 @@ buildvariants:

## Ops Manager build variants

# Isolated Ops Manager Tests for 6.0 version
# Isolated Ops Manager Tests for 6.0 version - kept for on-demand testing only
- name: e2e_om60_kind_ubi
display_name: e2e_om60_kind_ubi
tags: [ "pr_patch", "staging", "e2e_test_suite" ]
tags: [ "manual_patch", "e2e_test_suite" ]
run_on:
- ubuntu2204-medium-high-memory
<<: *base_om6_dependency
Expand All @@ -1386,10 +1386,10 @@ buildvariants:
- name: e2e_ops_manager_kind_5_0_only_task_group
- name: e2e_ops_manager_kind_6_0_only_task_group

# Isolated Ops Manager Tests for 6.0 version
# Isolated Ops Manager Tests for 6.0 version - kept for on-demand testing only
- name: e2e_static_om60_kind_ubi
display_name: e2e_static_om60_kind_ubi
tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
tags: [ "manual_patch", "e2e_test_suite", "static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
Expand Down Expand Up @@ -1585,7 +1585,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_multi_cluster_kind_task_group

Expand All @@ -1594,7 +1594,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_multi_cluster_kind_task_group

Expand All @@ -1603,7 +1603,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_multi_cluster_2_clusters_task_group

Expand All @@ -1612,7 +1612,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_multi_cluster_2_clusters_task_group

Expand All @@ -1621,7 +1621,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_multi_cluster_om_appdb_task_group

Expand All @@ -1630,7 +1630,7 @@ buildvariants:
tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
run_on:
- ubuntu2404-large
<<: *base_om6_dependency
<<: *base_om7_dependency
tasks:
- name: e2e_static_multi_cluster_om_appdb_task_group

Expand Down Expand Up @@ -1678,8 +1678,6 @@ buildvariants:
run_on:
- ubuntu2404-large
depends_on:
- name: build_om_images
variant: build_om60_images
- name: build_operator_ubi
variant: init_test_run
- name: build_test_image
Expand All @@ -1703,8 +1701,6 @@ buildvariants:
run_on:
- ubuntu2404-large
depends_on:
- name: build_om_images
variant: build_om60_images
- name: build_operator_ubi
variant: init_test_run
- name: build_test_image
Expand Down Expand Up @@ -1840,8 +1836,6 @@ buildvariants:
- name: init_tests_with_olm
display_name: init_tests_with_olm
depends_on:
- name: build_om_images
variant: build_om60_images
- name: build_operator_ubi
variant: init_test_run
- name: build_init_database_image_ubi
Expand Down Expand Up @@ -1874,9 +1868,10 @@ buildvariants:
tasks:
- name: preflight_images_task_group

# OM60 images build - kept for on-demand testing only
- name: build_om60_images
display_name: build_om60_images
tags: [ "pr_patch", "staging" ]
tags: [ "manual_patch" ]
run_on:
- ubuntu2404-small
tasks:
Expand Down Expand Up @@ -1931,6 +1926,36 @@ buildvariants:
- name: backup_csv_images_limit_3
- name: backup_csv_images_all

- name: publish_om70_images
display_name: publish_om70_images
tags: [ "manual_patch" ]
allowed_requesters: [ "patch", "github_pr" ]
run_on:
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
depends_on:
- variant: e2e_om70_kind_ubi
name: '*'
- variant: e2e_static_om70_kind_ubi
name: '*'
tasks:
- name: publish_ops_manager
- name: release_agent

- name: publish_om80_images
display_name: publish_om80_images
tags: [ "manual_patch" ]
allowed_requesters: [ "patch", "github_pr" ]
run_on:
- release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
depends_on:
- variant: e2e_om80_kind_ubi
name: '*'
- variant: e2e_static_om80_kind_ubi
name: '*'
tasks:
- name: publish_ops_manager
- name: release_agent

- name: migrate_all_agents
display_name: migrate_all_agents
tags: [ "manual_patch" ]
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/contexts/variables/om60
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -Eeou pipefail

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

export CUSTOM_MDB_VERSION=6.0.21
Expand Down
3 changes: 1 addition & 2 deletions scripts/dev/contexts/variables/om60_image
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

set -Eeou pipefail


OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_60_latest\s+(\S+)\s+#" < "${PROJECT_DIR}"/.evergreen.yml | awk '{print $3}')
OM_VERSION=6.0.27
export OM_VERSION
2 changes: 1 addition & 1 deletion scripts/dev/contexts/variables/om70
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -Eeou pipefail

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