om7 - only run upgrade test for major version changes (#4300)

# Summary

- we have been testing updating between patch versions, but the test was
there to test major version upgrades.
- Since we've removed 5.x support, we don't need that test for 6.x

## Proof of Work

- all upgrade tests will be green

## Checklist
- [ ] Have you linked a jira ticket and/or is the ticket in the title?
- [ ] Have you checked whether your jira ticket required DOCSP changes?
- [ ] Have you checked for release_note changes?

## Reminder (Please remove this when merging)
- Please try to Approve or Reject Changes the PR, keep PRs in review as
short as possible
- Our Short Guide for PRs:
[Link](REDACTED)
- Remember the following Communication Standards - use comment prefixes
for clarity:
  * **blocking**: Must be addressed before approval.
  * **follow-up**: Can be addressed in a later PR or ticket.
  * **q**: Clarifying question.
  * **nit**: Non-blocking suggestions.
  * **note**: Side-note, non-actionable. Example: Praise
  * --> no prefix is considered a question

Author: nammn

.evergreen.yml

@@ -1002,7 +1002,6 @@ task_groups:
       - e2e_om_ops_manager_https_enabled_internet_mode
       - e2e_om_ops_manager_https_enabled_prefix
       - e2e_om_ops_manager_scale
-      - e2e_om_ops_manager_upgrade
       - e2e_om_validation_webhook
       - e2e_om_ops_manager_secure_config
       - e2e_om_update_before_reconciliation
@@ -1039,7 +1038,6 @@ task_groups:
       - e2e_om_ops_manager_backup_kmip
       - e2e_om_ops_manager_pod_spec
       - e2e_om_ops_manager_scale
-      - e2e_om_ops_manager_upgrade
       - e2e_om_validation_webhook
       - e2e_om_ops_manager_secure_config
       - e2e_om_update_before_reconciliation
@@ -1084,6 +1082,15 @@ task_groups:
       - e2e_om_ops_manager_prometheus
     <<: *teardown_group
 
+  # Tests features only supported on OM70 and OM80, its only upgrade test as we test upgrading from 6 to 7 or 7 to 8
+  - name: e2e_ops_manager_upgrade_only_task_group
+    max_hosts: -1
+    <<: *setup_group
+    <<: *setup_and_teardown_task
+    tasks:
+      - e2e_om_ops_manager_upgrade
+    <<: *teardown_group
+
   # Tests features only supported on OM60
   - name: e2e_static_ops_manager_kind_6_0_only_task_group
     max_hosts: -1
@@ -1253,6 +1260,7 @@ buildvariants:
       - name: e2e_ops_manager_kind_only_task_group
       - name: e2e_ops_manager_kind_5_0_only_task_group
       - name: e2e_ops_manager_kind_6_0_only_task_group
+      - name: e2e_ops_manager_upgrade_only_task_group
 
   - name: e2e_static_om70_kind_ubi
     display_name: e2e_static_om70_kind_ubi
@@ -1263,6 +1271,7 @@ buildvariants:
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
       - name: e2e_static_ops_manager_kind_6_0_only_task_group
+      - name: e2e_ops_manager_upgrade_only_task_group
 
   - name: e2e_om80_kind_ubi
     display_name: e2e_om80_kind_ubi
@@ -1274,6 +1283,7 @@ buildvariants:
       - name: e2e_ops_manager_kind_only_task_group
       - name: e2e_ops_manager_kind_5_0_only_task_group
       - name: e2e_ops_manager_kind_6_0_only_task_group
+      - name: e2e_ops_manager_upgrade_only_task_group
 
   - name: e2e_static_om80_kind_ubi
     display_name: e2e_static_om80_kind_ubi
@@ -1284,6 +1294,7 @@ buildvariants:
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
       - name: e2e_static_ops_manager_kind_6_0_only_task_group
+      - name: e2e_ops_manager_upgrade_only_task_group
 
   - name: e2e_operator_race_ubi_with_telemetry
     display_name: e2e_operator_race_ubi_with_telemetry

scripts/dev/contexts/e2e_kind_olm_ubi

@@ -6,6 +6,6 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=kind

scripts/dev/contexts/e2e_multi_cluster_kind

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"

scripts/dev/contexts/e2e_multi_cluster_om_appdb

@@ -6,7 +6,12 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
+
+# TODO Remove this once the startup script for OM can handle skipping preflight checks.
+# As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario.
+# https://jira.mongodb.org/browse/CLOUDP-297377
+export CUSTOM_OM_VERSION=7.0.12
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-cluster-1"

scripts/dev/contexts/e2e_multi_cluster_om_operator_not_in_mesh

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"

scripts/dev/contexts/e2e_operator_no_webhook_roles_cloudqa

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export ops_manager_version="cloud_qa"
 

scripts/dev/contexts/e2e_operator_race_ubi_with_telemetry

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"

scripts/dev/contexts/e2e_smoke

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export DATABASE_REGISTRY="${QUAY_REGISTRY}"
 export APPDB_REGISTRY="${QUAY_REGISTRY}"

scripts/dev/contexts/e2e_static_multi_cluster_kind

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"

scripts/dev/contexts/e2e_static_multi_cluster_om_appdb

@@ -8,12 +8,6 @@ script_dir=$(dirname "${script_name}")
 source "${script_dir}/root-context"
 source "${script_dir}/variables/om70"
 
-# The earliest version supporting Static Containers for OM
-# We started supporting Static Containers in 6.0.21, except for OM
-# This CUSTOM version is required for upgrade tests to work
-# shellcheck disable=SC2034
-export CUSTOM_OM_PREV_VERSION=6.0.27
-
 # TODO Remove this once the startup script for OM can handle skipping preflight checks.
 # As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario.
 # https://jira.mongodb.org/browse/CLOUDP-297377

scripts/dev/contexts/e2e_static_operator_kind_ubi_cloudqa

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export ops_manager_version="cloud_qa"
 export MDB_DEFAULT_ARCHITECTURE=static

scripts/dev/contexts/e2e_static_smoke

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export DATABASE_REGISTRY="${QUAY_REGISTRY}"
 export APPDB_REGISTRY="${QUAY_REGISTRY}"

scripts/dev/contexts/manual_telemetry_multi_cluster_dev

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"

scripts/dev/contexts/manual_telemetry_multi_cluster_prod

@@ -6,7 +6,7 @@ script_name=$(readlink -f "${BASH_SOURCE[0]}")
 script_dir=$(dirname "${script_name}")
 
 source "${script_dir}/root-context"
-source "${script_dir}/variables/om60"
+source "${script_dir}/variables/om70"
 
 export KUBE_ENVIRONMENT_NAME=multi
 export CLUSTER_NAME="kind-e2e-operator"