Skip to content

[DPE-6788] Rollback provider.py skips && move the upgrade test forward #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phvalguima wants to merge 2 commits into
base: 2/edge
Choose a base branch
from
Open

[DPE-6788] Rollback provider.py skips && move the upgrade test forward #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c7a1b5
[DPE-6788] Rollback provider.py skips && move the upgrade test forward
Mar 13, 2025
c6eee34
Update test_small_deployment_upgrades.py
Mar 13, 2025
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
14 changes: 0 additions & 14 deletions tests/integration/relations/test_opensearch_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
]


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -111,7 +110,6 @@ async def test_create_relation(ops_test: OpsTest, application_charm, opensearch_
)


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -151,7 +149,6 @@ async def test_index_usage(ops_test: OpsTest):
)


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -194,7 +191,6 @@ async def test_bulk_index_usage(ops_test: OpsTest):
assert set(artists) == {"Herbie Hancock", "Lydian Collective", "Vulfpeck"}


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -224,7 +220,6 @@ async def get_secret_data(ops_test, secret_uri):
return json.loads(stdout)[secret_unique_id]["content"]["Data"]


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -258,7 +253,6 @@ async def test_dashboard_relation(ops_test: OpsTest):
assert relation_user_pwd == result.response.get("password")


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -289,7 +283,6 @@ async def test_dashboard_relation_password_change(ops_test: OpsTest):
assert relation_user_pwd == result.response.get("password")


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -355,7 +348,6 @@ async def _is_number_of_endpoints_valid(client_app: str, rel: str) -> bool:
), await rel_endpoints(CLIENT_APP_NAME, FIRST_RELATION_NAME)


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -422,7 +414,6 @@ async def test_multiple_relations(ops_test: OpsTest, application_charm):
assert "403 Client Error: Forbidden for url:" in results[0], results


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -461,7 +452,6 @@ async def test_multiple_relations_accessing_same_index(ops_test: OpsTest):
assert set(artists) == {"Herbie Hancock", "Lydian Collective", "Vulfpeck"}


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -500,7 +490,6 @@ async def test_admin_relation(ops_test: OpsTest):
assert set(artists) == {"Herbie Hancock", "Lydian Collective", "Vulfpeck"}


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -570,7 +559,6 @@ async def test_admin_permissions(ops_test: OpsTest):
assert "Error:" in results[0], results


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -633,7 +621,6 @@ async def test_normal_user_permissions(ops_test: OpsTest):
assert "Error:" in results[0], results


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down Expand Up @@ -690,7 +677,6 @@ async def test_relation_broken(ops_test: OpsTest):
assert relation_user not in users.keys()


@pytest.mark.skip(reason="Merge 2.18 change")
@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"])
@pytest.mark.group(1)
@pytest.mark.abort_on_fail
Expand Down
11 changes: 4 additions & 7 deletions tests/integration/upgrades/test_small_deployment_upgrades.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@

OPENSEARCH_ORIGINAL_CHARM_NAME = "opensearch"
OPENSEARCH_CHANNEL = "2/edge"
OPENSEARCH_STABLE_CHANNEL = "2/stable"


STARTING_VERSION = "2.15.0"
STARTING_VERSION = "2.16.0"


VERSION_TO_REVISION = {
STARTING_VERSION: 144,
"2.16.0": 160,
STARTING_VERSION: 160,
"2.17.0": 207,
}


Expand Down Expand Up @@ -246,13 +245,11 @@ async def test_upgrade_rollback_from_local(
)

logger.info(f"Rolling back to {version}")
# TODO: return to 2/edge channel instead once this channel's latest 2.17 charm
# revision points to snap rev. 65 instead of snap rev. 62.
await refresh(
ops_test,
app,
switch=OPENSEARCH_ORIGINAL_CHARM_NAME,
channel=OPENSEARCH_STABLE_CHANNEL,
channel=OPENSEARCH_CHANNEL,
)
# Wait until we are set in an idle state and can rollback the revision.
# app status blocked: that will happen if we are jumping N-2 versions in our test
Expand Down
Loading