diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 268ec2c97..e4fc65d6b 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -130,6 +130,30 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.1.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_1_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_0 @@ -146,8 +170,38 @@ spec: value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_0 @@ -210,6 +264,12 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.27" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_9 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.9" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_10 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.10" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_11 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.11" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_12 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.12" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_13 @@ -218,6 +278,16 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.1" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_2 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.2" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_3 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.3" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6 diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml index 81f47dcdf..7b8a5dcaf 100644 --- a/helm_chart/values-openshift.yaml +++ b/helm_chart/values-openshift.yaml @@ -33,10 +33,18 @@ relatedImages: - 6.0.25 - 6.0.26 - 6.0.27 + - 7.0.9 + - 7.0.10 + - 7.0.11 - 7.0.12 - 7.0.13 - 7.0.14 - 7.0.15 + - 8.0.0 + - 8.0.1 + - 8.0.2 + - 8.0.3 + - 8.0.4 - 8.0.5 - 8.0.6 - 8.0.7 @@ -91,6 +99,18 @@ relatedImages: - 8.0.0-ubi8 - 8.0.0-ubi9 agent: + - 107.0.10.8627-1 + - 107.0.10.8627-1_1.0.0 + - 107.0.10.8627-1_1.0.1 + - 107.0.10.8627-1_1.1.0 + - 107.0.11.8645-1 + - 107.0.11.8645-1_1.0.0 + - 107.0.11.8645-1_1.0.1 + - 107.0.11.8645-1_1.1.0 + - 107.0.12.8669-1 + - 107.0.12.8669-1_1.0.0 + - 107.0.12.8669-1_1.0.1 + - 107.0.12.8669-1_1.1.0 - 107.0.13.8702-1 - 107.0.13.8702-1_1.0.0 - 107.0.13.8702-1_1.0.1 @@ -99,7 +119,22 @@ relatedImages: - 107.0.15.8741-1_1.0.0 - 107.0.15.8741-1_1.0.1 - 107.0.15.8741-1_1.1.0 + - 107.0.9.8621-1 + - 107.0.9.8621-1_1.0.0 + - 107.0.9.8621-1_1.0.1 + - 107.0.9.8621-1_1.1.0 + - 108.0.1.8718-1 + - 108.0.1.8718-1_1.0.0 + - 108.0.1.8718-1_1.0.1 + - 108.0.1.8718-1_1.1.0 - 108.0.2.8729-1 + - 108.0.2.8729-1_1.0.0 + - 108.0.2.8729-1_1.0.1 + - 108.0.2.8729-1_1.1.0 + - 108.0.3.8758-1 + - 108.0.3.8758-1_1.0.0 + - 108.0.3.8758-1_1.0.1 + - 108.0.3.8758-1_1.1.0 - 108.0.4.8770-1 - 108.0.4.8770-1_1.0.0 - 108.0.4.8770-1_1.0.1 diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index a8fba44e2..127e23d71 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -412,6 +412,30 @@ spec: value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.1.0" - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_1_0 value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_10_8627_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.10.8627-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_11_8645_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.11.8645-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_0 @@ -428,8 +452,38 @@ spec: value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1" - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0 value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_107_0_9_8621_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:107.0.9.8621-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1_1.1.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.0" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_0_1 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.0.1" + - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1_1_1_0 + value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1_1.1.0" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1 value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1" - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_0 @@ -492,6 +546,12 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.27" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_9 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.9" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_10 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.10" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_11 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.11" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_12 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.12" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_13 @@ -500,6 +560,16 @@ spec: value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.1" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_2 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.2" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_3 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.3" + - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_4 + value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.4" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_5 value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.5" - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_6 diff --git a/release.json b/release.json index 4fdb45ec1..be6e433fe 100644 --- a/release.json +++ b/release.json @@ -41,10 +41,18 @@ "6.0.25", "6.0.26", "6.0.27", + "7.0.9", + "7.0.10", + "7.0.11", "7.0.12", "7.0.13", "7.0.14", "7.0.15", + "8.0.0", + "8.0.1", + "8.0.2", + "8.0.3", + "8.0.4", "8.0.5", "8.0.6", "8.0.7" @@ -113,6 +121,22 @@ "agent_version": "12.0.35.7911-1", "tools_version": "100.10.0" }, + "7.0.9": { + "agent_version": "107.0.9.8621-1", + "tools_version": "100.9.5" + }, + "7.0.10": { + "agent_version": "107.0.10.8627-1", + "tools_version": "100.9.5" + }, + "7.0.11": { + "agent_version": "107.0.11.8645-1", + "tools_version": "100.10.0" + }, + "7.0.12": { + "agent_version": "107.0.12.8669-1", + "tools_version": "100.10.0" + }, "7.0.13": { "agent_version": "107.0.13.8702-1", "tools_version": "100.10.0" @@ -125,6 +149,22 @@ "agent_version": "107.0.15.8741-1", "tools_version": "100.11.0" }, + "8.0.1": { + "agent_version": "108.0.1.8718-1", + "tools_version": "100.10.0" + }, + "8.0.2": { + "agent_version": "108.0.2.8729-1", + "tools_version": "100.10.0" + }, + "8.0.3": { + "agent_version": "108.0.3.8758-1", + "tools_version": "100.10.0" + }, + "8.0.4": { + "agent_version": "108.0.4.8770-1", + "tools_version": "100.10.0" + }, "8.0.5": { "agent_version": "108.0.4.8770-1", "tools_version": "100.11.0" diff --git a/scripts/evergreen/release/update_release.py b/scripts/evergreen/release/update_release.py index 1888061fb..2cd872b95 100755 --- a/scripts/evergreen/release/update_release.py +++ b/scripts/evergreen/release/update_release.py @@ -3,10 +3,8 @@ import json import logging import os -from collections import defaultdict import yaml -from packaging import version logger = logging.getLogger(__name__) @@ -19,71 +17,71 @@ def get_latest_om_versions_from_evergreen_yml(): return data["variables"][0], data["variables"][1] -def trim_versions(versions_list, number_of_versions=3): - """ - Keep only the latest number_of_versions versions per major version in a versions list. - Returns a sorted list with trimmed versions. - """ - - major_version_groups = defaultdict(list) - for v in versions_list: - try: - major_version = v.split(".")[0] - major_version_groups[major_version].append(v) - except (IndexError, AttributeError): - # Keep versions that don't follow the expected format - continue - - trimmed_versions = [] - - for major_version, versions in major_version_groups.items(): - versions.sort(key=lambda x: version.parse(x), reverse=True) - latest_versions = versions[:number_of_versions] - for v in latest_versions: - if v not in trimmed_versions: - trimmed_versions.append(v) - - # Sort the final list in ascending order - trimmed_versions.sort(key=lambda x: version.parse(x)) - return trimmed_versions - - -def trim_supported_image_versions(release: dict, image_types: list): - """ - Trim the versions list for specified image types to keep only - the latest 3 versions per major version. - """ - for image_type in image_types: - if image_type in release["supportedImages"]: - original_versions = release["supportedImages"][image_type]["versions"] - trimmed_versions = trim_versions(original_versions, 3) - - # TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests - # https://jira.mongodb.org/browse/CLOUDP-297377 - if image_type == "ops-manager": - trimmed_versions.append("7.0.12") - trimmed_versions.sort(key=lambda x: version.parse(x)) - - release["supportedImages"][image_type]["versions"] = trimmed_versions - - -def trim_ops_manager_mapping(release: dict): - """ - Keep only the latest 3 versions per major version in opsManagerMapping.ops_manager. - """ - if ( - "mongodb-agent" in release["supportedImages"] - and "opsManagerMapping" in release["supportedImages"]["mongodb-agent"] - ): - ops_manager_mapping = release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"] - - all_versions = ops_manager_mapping.keys() - - trimmed_versions = trim_versions(all_versions, 3) - - trimmed_mapping = {v: ops_manager_mapping[v] for v in trimmed_versions} - - release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"] = trimmed_mapping +# def trim_versions(versions_list, number_of_versions=3): +# """ +# Keep only the latest number_of_versions versions per major version in a versions list. +# Returns a sorted list with trimmed versions. +# """ +# +# major_version_groups = defaultdict(list) +# for v in versions_list: +# try: +# major_version = v.split(".")[0] +# major_version_groups[major_version].append(v) +# except (IndexError, AttributeError): +# # Keep versions that don't follow the expected format +# continue +# +# trimmed_versions = [] +# +# for major_version, versions in major_version_groups.items(): +# versions.sort(key=lambda x: version.parse(x), reverse=True) +# latest_versions = versions[:number_of_versions] +# for v in latest_versions: +# if v not in trimmed_versions: +# trimmed_versions.append(v) +# +# # Sort the final list in ascending order +# trimmed_versions.sort(key=lambda x: version.parse(x)) +# return trimmed_versions +# +# +# def trim_supported_image_versions(release: dict, image_types: list): +# """ +# Trim the versions list for specified image types to keep only +# the latest 3 versions per major version. +# """ +# for image_type in image_types: +# if image_type in release["supportedImages"]: +# original_versions = release["supportedImages"][image_type]["versions"] +# trimmed_versions = trim_versions(original_versions, 3) +# +# # TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests +# # https://jira.mongodb.org/browse/CLOUDP-297377 +# if image_type == "ops-manager": +# trimmed_versions.append("7.0.12") +# trimmed_versions.sort(key=lambda x: version.parse(x)) +# +# release["supportedImages"][image_type]["versions"] = trimmed_versions +# +# +# def trim_ops_manager_mapping(release: dict): +# """ +# Keep only the latest 3 versions per major version in opsManagerMapping.ops_manager. +# """ +# if ( +# "mongodb-agent" in release["supportedImages"] +# and "opsManagerMapping" in release["supportedImages"]["mongodb-agent"] +# ): +# ops_manager_mapping = release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"] +# +# all_versions = ops_manager_mapping.keys() +# +# trimmed_versions = trim_versions(all_versions, 3) +# +# trimmed_mapping = {v: ops_manager_mapping[v] for v in trimmed_versions} +# +# release["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"] = trimmed_mapping def update_release_json(): @@ -93,12 +91,12 @@ def update_release_json(): data = json.load(fd) # Trim ops_manager_mapping to keep only the latest 3 versions - trim_ops_manager_mapping(data) + # trim_ops_manager_mapping(data) # Trim init and operator images to keep only the latest 3 versions per major - trim_supported_image_versions( - data, ["mongodb-kubernetes", "init-ops-manager", "init-database", "init-appdb", "database", "ops-manager"] - ) + # trim_supported_image_versions( + # data, ["mongodb-kubernetes", "init-ops-manager", "init-database", "init-appdb", "database", "ops-manager"] + # ) # PCT already bumps the release.json, such that the last element contains the newest version, since they are sorted newest_om_version = data["supportedImages"]["ops-manager"]["versions"][-1]