Skip to content

Commit 3d7148a

Browse files
committed
Fix package and service names
1 parent 67d3957 commit 3d7148a

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
from kubernetes.client.rest import ApiException
33
from kubetester import MongoDB, read_service, wait_for_webhook
44
from kubetester.kubetester import fixture as yaml_fixture
5-
from kubetester.kubetester import (
6-
get_default_architecture,
7-
is_default_architecture_static,
8-
)
5+
from kubetester.kubetester import get_default_architecture
96
from kubetester.opsmanager import MongoDBOpsManager
7+
from tests.conftest import OPERATOR_NAME
108
from tests.olm.olm_test_commons import (
119
get_catalog_image,
1210
get_catalog_source_resource,
@@ -37,11 +35,11 @@ def test_upgrade_operator_only(namespace: str, version_id: str):
3735

3836
static_value = get_default_architecture()
3937
subscription = get_subscription_custom_object(
40-
"mongodb-kubernetes",
38+
OPERATOR_NAME,
4139
namespace,
4240
{
4341
"channel": "stable", # stable channel contains latest released operator in RedHat's certified repository
44-
"name": "mongodb-enterprise",
42+
"name": "mongodb-kubernetes",
4543
"source": catalog_source_resource.name,
4644
"sourceNamespace": namespace,
4745
"installPlanApproval": "Automatic",
@@ -60,13 +58,13 @@ def test_upgrade_operator_only(namespace: str, version_id: str):
6058

6159
subscription.update()
6260

63-
wait_for_operator_ready(namespace, "mongodb-kubernetes", f"mongodb-kubernetes.v{latest_released_operator_version}")
61+
wait_for_operator_ready(namespace, OPERATOR_NAME, f"mongodb-kubernetes.v{latest_released_operator_version}")
6462

6563
subscription.load()
6664
subscription["spec"]["channel"] = "fast" # fast channel contains operator build from the current branch
6765
subscription.update()
6866

69-
wait_for_operator_ready(namespace, "mongodb-kubernetes", f"mongodb-kubernetes.v{incremented_operator_version}")
67+
wait_for_operator_ready(namespace, OPERATOR_NAME, f"mongodb-kubernetes.v{incremented_operator_version}")
7068

7169

7270
@pytest.mark.e2e_olm_operator_upgrade
@@ -80,7 +78,7 @@ def test_operator_webhook_is_deleted_and_not_installed_anymore(namespace: str):
8078

8179
@pytest.mark.e2e_olm_operator_upgrade
8280
def test_wait_for_webhook(namespace: str):
83-
wait_for_webhook(namespace=namespace, service_name="mongodb-enterprise-operator-service")
81+
wait_for_webhook(namespace=namespace, service_name="mongodb-kubernetes-operator-service")
8482

8583

8684
@pytest.mark.e2e_olm_operator_upgrade

docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@
1111
from kubetester.certs import create_sharded_cluster_certs
1212
from kubetester.kubetester import ensure_ent_version
1313
from kubetester.kubetester import fixture as yaml_fixture
14-
from kubetester.kubetester import (
15-
get_default_architecture,
16-
is_default_architecture_static,
17-
run_periodically,
18-
)
14+
from kubetester.kubetester import get_default_architecture, run_periodically
1915
from kubetester.mongodb import Phase
2016
from kubetester.mongodb_user import MongoDBUser
2117
from kubetester.opsmanager import MongoDBOpsManager
2218
from pytest import fixture
19+
from tests.conftest import OPERATOR_NAME
2320
from tests.olm.olm_test_commons import (
2421
get_catalog_image,
2522
get_catalog_source_resource,
@@ -64,11 +61,11 @@ def catalog_source(namespace: str, version_id: str):
6461
def subscription(namespace: str, catalog_source: CustomObject):
6562
static_value = get_default_architecture()
6663
return get_subscription_custom_object(
67-
"mongodb-kubernetes",
64+
OPERATOR_NAME,
6865
namespace,
6966
{
7067
"channel": "stable", # stable channel contains latest released operator in RedHat's certified repository
71-
"name": "mongodb-enterprise",
68+
"name": "mongodb-kubernetes",
7269
"source": catalog_source.name,
7370
"sourceNamespace": namespace,
7471
"installPlanApproval": "Automatic",
@@ -100,7 +97,7 @@ def test_install_stable_operator_version(
10097
subscription: CustomObject,
10198
):
10299
subscription.update()
103-
wait_for_operator_ready(namespace, "mongodb-kubernetes", f"mongodb-kubernetes.v{current_operator_version}")
100+
wait_for_operator_ready(namespace, OPERATOR_NAME, f"mongodb-kubernetes.v{current_operator_version}")
104101

105102

106103
# install resources on the latest released version of the operator
@@ -368,7 +365,7 @@ def update_subscription() -> bool:
368365

369366
run_periodically(update_subscription, timeout=100, msg="Subscription to be updated")
370367

371-
wait_for_operator_ready(namespace, "mongodb-kubernetes", f"mongodb-kubernetes.v{incremented_operator_version}")
368+
wait_for_operator_ready(namespace, OPERATOR_NAME, f"mongodb-kubernetes.v{incremented_operator_version}")
372369

373370

374371
@pytest.mark.e2e_olm_operator_upgrade_with_resources

0 commit comments

Comments
 (0)