Skip to content

ovn: Make "Prometheus" and "HW Offload" tests skippable.#1336

Merged
mkalcok merged 2 commits intoopenstack-charmers:stable/caracalfrom
mkalcok:optional-prometheus
Jan 28, 2026
Merged

ovn: Make "Prometheus" and "HW Offload" tests skippable.#1336
mkalcok merged 2 commits intoopenstack-charmers:stable/caracalfrom
mkalcok:optional-prometheus

Conversation

@mkalcok
Copy link
Copy Markdown
Contributor

@mkalcok mkalcok commented Jan 22, 2026

In order to use GH runners for functional tests of OVN chassis charms, we need the support for LXD VMs in Juju. This feature is supported since 3.1, but unfortunately, zaza and zaza-openstack-tests in stable/yoga branch don't support Juju3.
A solution for 22.03 releases of ovn-chassis and ovn-dedicated-chassis, which until now used zaza stable/yoga, is to upgrade zaza to stable/caracal. This works fine in general and brings us a lot of fixes that were already backported to this branch, but we need to make couple tests optional, because the functionality is not present in 22.03 version of charms. Optional tests are controlled via environment variables.

  • Exporting TEST_SKIP_PROMETHEUS skips test for reachability of prometheus exporter
  • Exporting TEST_SKIP_HW_OFFLOAD skips test for "Hardware offload"

mkalcok added a commit to canonical/charm-ovn-chassis that referenced this pull request Jan 22, 2026
Func-test-pr: openstack-charmers/zaza-openstack-tests#1336
Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
mkalcok added a commit to canonical/charm-ovn-chassis that referenced this pull request Jan 22, 2026
To run functional tests on GH runners, we need to use LXD juju substrate.
However only Juju 3.1+ supports createing LXD VMs (need by the functional
test).
Rather than bringing Juju 3 support to stable/yoga branch of zaza and
zaza-openstack-tests, it is easier for us to switch to stable/caracal branch
that already supports Juju 3.

Func-test-pr: openstack-charmers/zaza-openstack-tests#1336
Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
@mkalcok mkalcok marked this pull request as ready for review January 22, 2026 15:53
@mkalcok
Copy link
Copy Markdown
Contributor Author

mkalcok commented Jan 22, 2026

The change was tested and passed in this PR: canonical/charm-ovn-chassis#18

@mkalcok mkalcok requested a review from fnordahl January 22, 2026 15:57
mkalcok added a commit to mkalcok/charm-ovn-dedicated-chassis that referenced this pull request Jan 22, 2026
To run functional tests on GH runners, we need to use LXD juju substrate.
However only Juju 3.1+ supports createing LXD VMs (need by the functional
test).
Rather than bringing Juju 3 support to stable/yoga branch of zaza and
zaza-openstack-tests, it is easier for us to switch to stable/caracal branch
that already supports Juju 3.

Func-test-pr: openstack-charmers/zaza-openstack-tests#1336
Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
When env. variable 'TEST_SKIP_PROMETHEUS' is exported, the prometheus exporter
test is skipped.

This allows older releases of OVN charms to use stable/caracal branch of
zaza-openstack-tests and benefit from the Juju3 support.

Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
When env. variable 'TEST_SKIP_HW_OFFLOAD' is exported, the Hardware Offload
test is skipped.

This allows older releases of ovn-dedicated-chassis charm, which lack the HW
offload support, to use stable/caracal branch of zaza-openstack-tests and
benefit from the Juju3 support.

Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
@mkalcok mkalcok force-pushed the optional-prometheus branch from 0211bc4 to da8b170 Compare January 26, 2026 14:43
mkalcok added a commit to mkalcok/charm-ovn-dedicated-chassis that referenced this pull request Jan 26, 2026
To run functional tests on GH runners, we need to use LXD juju substrate.
However only Juju 3.1+ supports createing LXD VMs (need by the functional
test).
Rather than bringing Juju 3 support to stable/yoga branch of zaza and
zaza-openstack-tests, it is easier for us to switch to stable/caracal branch
that already supports Juju 3.

Func-test-pr: openstack-charmers/zaza-openstack-tests#1336
Signed-off-by: Martin Kalcok <martin.kalcok@canonical.com>
@mkalcok mkalcok changed the title ovn: Make Prometheus tests skippable. ovn: Make "Prometheus" and "HW Offload" tests skippable. Jan 27, 2026
Copy link
Copy Markdown
Contributor

@fnordahl fnordahl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a reasonable compromise, LGTM.

@mkalcok mkalcok merged commit 51ad2a2 into openstack-charmers:stable/caracal Jan 28, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants