Skip to content

[DPE-11496] (PART 8) CI/CD migration to single-kernel: jubilant migration, part 1 - #431

Merged
xavipg003 merged 3 commits into
dpe-11496-7from
dpe-11496-8
Nov 20, 2026
Merged

xavipg003 merged 3 commits into
dpe-11496-7from
dpe-11496-8

Conversation

@xavipg003

Copy link
Copy Markdown
Contributor

Description

This PR continues moving the PostgreSQL integration tests from the VM and K8s charm repos into the single kernel library. Builds on #426.

It starts migrating the tests that still use pytest-operator to jubilant. This first part covers the modules that only need mechanical changes or helpers that already exist in jubilant.

What's included

  • Imports only: test_filesystem_layout and test_headless_service take CHARM_BASE from charm/helpers.py instead of pytest_operator_helpers.py.
  • Migrated to jubilant:
    • test_ldap, test_trust (K8s-only).
    • high_availability/: test_synchronous_policy, test_logical_replication, test_logical_replication_circular.
    • new_relations/: test_new_relations_2, test_relations_coherence.
  • Move: the three migrated HA tests move from ha_tests/ to high_availability/, the jubilant HA folder. Their Spread tasks point to the new path. ha_tests/ now only holds the tests that still use pytest-operator.

How the migration was done

  • Keep the original test names, scenarios, marks (vm_only, k8s_only, abort_on_fail) and substrate branches.
  • Use the juju fixture instead of ops_test, and the existing jubilant helpers (build_connection_string, get_cluster_roles, fast_forward, wait_for_apps_status, ...).
  • asyncio.gather calls become sequential calls, and wait_for_idle/block_until become juju.wait.
  • test_ldap checks the Juju CLI version (juju.version()) for its Juju 3 skip, instead of the libjuju package version.

@xavipg003
xavipg003 merged commit ee4c91a into 16/edge Nov 20, 2026
5 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants