Skip to content

Commit 4ed34c5

Browse files
lucian-tosaMaciejKaras
authored andcommitted
CLOUDP-286015 - Pin appdb images to older build (#3929)
# Summary Works towards [CLOUDP-286015](https://jira.mongodb.org/browse/CLOUDP-286015). Temporarily pin older appdb images that don't have issues making many of ours e2e tests fail. ## Documentation changes * [ ] Add an entry to [release notes](.../RELEASE_NOTES.md). * [ ] When needed, make sure you create a new [DOCSP ticket](https://jira.mongodb.org/projects/DOCSP) that documents your change. ## Changes to CRDs * [ ] Add `slaskawi`(Sebastian) and `@giohan` (George) as reviewers. * [ ] Make sure any changes are reflected on `/public/samples` directory. --------- Co-authored-by: Maciej Karaś <maciej.karas@mongodb.com>
1 parent f4f256d commit 4ed34c5

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

docker/mongodb-enterprise-tests/kubetester/mongotester.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def assert_no_connection(self, opts: Optional[List[Dict[str, str]]] = None):
142142

143143
def assert_version(self, expected_version: str):
144144
# version field does not contain -ent suffix in MongoDB
145-
assert self.client.admin.command("buildInfo")["version"] == expected_version.rstrip("-ent")
145+
assert self.client.admin.command("buildInfo")["version"] == expected_version.split("-")[0]
146146
if expected_version.endswith("-ent"):
147147
self.assert_is_enterprise()
148148

docker/mongodb-enterprise-tests/tests/upgrades/operator_upgrade_sharded_cluster.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ def test_install_latest_official_operator(
107107
log_deployments_info(namespace)
108108

109109
def test_create_sharded_cluster(self, sharded_cluster: MongoDB):
110-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=200)
110+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=600)
111111

112112
def test_scale_up_sharded_cluster(self, sharded_cluster: MongoDB):
113113
sharded_cluster.load()
114114
sharded_cluster["spec"]["mongodsPerShardCount"] = 3
115115
sharded_cluster["spec"]["configServerCount"] = 3
116116
sharded_cluster.update()
117-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=150)
117+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=600)
118118

119119

120120
@pytest.mark.e2e_operator_upgrade_sharded_cluster
@@ -126,8 +126,8 @@ def test_upgrade_operator(self, default_operator: Operator, namespace: str):
126126
log_deployments_info(namespace)
127127

128128
def test_sharded_cluster_reconciled(self, sharded_cluster: MongoDB, namespace: str):
129-
sharded_cluster.assert_abandons_phase(phase=Phase.Running, timeout=150)
130-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=420)
129+
sharded_cluster.assert_abandons_phase(phase=Phase.Running, timeout=600)
130+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=600)
131131
logger.debug("State configmap after upgrade")
132132
log_state_configmap(namespace)
133133

@@ -139,7 +139,7 @@ def test_scale_down_sharded_cluster(self, sharded_cluster: MongoDB, namespace: s
139139
sharded_cluster["spec"]["mongodsPerShardCount"] = 2
140140
sharded_cluster["spec"]["configServerCount"] = 2
141141
sharded_cluster.update()
142-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=300)
142+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=600)
143143
logger.debug("State configmap after upgrade and scaling")
144144
log_state_configmap(namespace)
145145

@@ -168,8 +168,8 @@ def test_downgrade_operator(
168168
log_deployments_info(namespace)
169169

170170
def test_sharded_cluster_reconciled(self, sharded_cluster: MongoDB):
171-
sharded_cluster.assert_abandons_phase(phase=Phase.Running, timeout=150)
172-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=750)
171+
sharded_cluster.assert_abandons_phase(phase=Phase.Running, timeout=600)
172+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=1000)
173173

174174
def test_assert_connectivity(self, ca_path: str):
175175
ShardedClusterTester(MDB_RESOURCE, 1, ssl=True, ca_path=ca_path).assert_connectivity()
@@ -179,4 +179,4 @@ def test_scale_up_sharded_cluster(self, sharded_cluster: MongoDB):
179179
sharded_cluster["spec"]["mongodsPerShardCount"] = 3
180180
sharded_cluster["spec"]["configServerCount"] = 3
181181
sharded_cluster.update()
182-
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=150)
182+
sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=600)

scripts/dev/contexts/e2e_static_multi_cluster_om_appdb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ export CENTRAL_CLUSTER=kind-e2e-cluster-1
2121
export test_pod_cluster=kind-e2e-cluster-1
2222
export ops_manager_version="cloud_qa"
2323
export MDB_DEFAULT_ARCHITECTURE=static
24+
export CUSTOM_APPDB_VERSION="7.0.2-ubi9-20241112T085558Z"

scripts/dev/contexts/e2e_static_om60_kind_ubi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ export CUSTOM_OM_PREV_VERSION=6.0.23
2121
export CUSTOM_MDB_VERSION=6.0.16
2222
# We can't use a 5.0.x version for this static variant because there's no UBI9 image for the 5.0.x series
2323
export CUSTOM_MDB_PREV_VERSION=6.0.5
24+
export CUSTOM_APPDB_VERSION="6.0.5-ubi9-20241112T090442Z"

scripts/dev/contexts/e2e_static_om70_kind_ubi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ export KUBE_ENVIRONMENT_NAME=kind
1212
export MDB_DEFAULT_ARCHITECTURE=static
1313
export CUSTOM_MDB_VERSION=7.0.5
1414
export CUSTOM_MDB_PREV_VERSION=6.0.16
15+
export CUSTOM_APPDB_VERSION="7.0.2-ubi9-20241112T085558Z"

scripts/dev/contexts/e2e_static_om80_kind_ubi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ source "$script_dir/variables/om80"
1010

1111
export KUBE_ENVIRONMENT_NAME=kind
1212
export MDB_DEFAULT_ARCHITECTURE=static
13+
export CUSTOM_APPDB_VERSION="8.0.0-ubi9-20241112T091101Z"

scripts/dev/contexts/e2e_static_operator_kind_ubi_cloudqa

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ export MDB_DEFAULT_ARCHITECTURE=static
1414
export CUSTOM_MDB_VERSION=6.0.16
1515
# We can't use a 5.0.x version for this static variant because there's no UBI9 image for the 5.0.x series
1616
export CUSTOM_MDB_PREV_VERSION=6.0.5
17+
export CUSTOM_APPDB_VERSION="6.0.5-ubi9-20241112T090442Z"

0 commit comments

Comments
 (0)