From c46e8a0c789395a84a08a682aff30453d2025665 Mon Sep 17 00:00:00 2001 From: James Garner Date: Mon, 7 Sep 2026 12:19:11 +1200 Subject: [PATCH 1/2] test: flat layout for test charms, minor doc fixes/improvements --- interfaces/tls-certificates/pyproject.toml | 7 ++++--- .../integration/charms/common/local-library/README.md | 8 ++++++++ .../charms/common/local-library/pyproject.toml | 1 + .../tests/integration/charms/common/local-library/src | 1 + .../{provider/charm.py => common/provider-charm.py} | 0 .../provider-charmcraft.yaml} | 0 .../provider-self-signed-certificates.py} | 0 .../{requirer/charm.py => common/requirer-charm.py} | 0 .../requirer-charmcraft.yaml} | 0 .../requirer-fetch-lib-charm.py} | 0 .../charms/fetch-lib-latest-requirer/charmcraft.yaml | 1 + .../pyproject.toml | 0 .../charms/fetch-lib-latest-requirer/src/charm.py | 1 + .../charms/fetch-lib-pre-fix-requirer/charmcraft.yaml | 1 + .../pyproject.toml | 0 .../charms/fetch-lib-pre-fix-requirer/src/charm.py | 1 + .../integration/charms/local-provider/charmcraft.yaml | 1 + .../tests/integration/charms/local-provider/library | 1 + .../{provider/local => local-provider}/pyproject.toml | 0 .../integration/charms/local-provider/src/charm.py | 1 + .../local-provider/src/self_signed_certificates.py | 1 + .../integration/charms/local-requirer/charmcraft.yaml | 1 + .../tests/integration/charms/local-requirer/library | 1 + .../{requirer/local => local-requirer}/pyproject.toml | 0 .../integration/charms/local-requirer/src/charm.py | 1 + .../integration/charms/provider/local/charmcraft.yaml | 1 - .../charms/provider/local/library/README.md | 1 - .../charms/provider/local/library/pyproject.toml | 1 - .../integration/charms/provider/local/library/src | 1 - .../integration/charms/provider/local/src/charm.py | 1 - .../provider/local/src/self_signed_certificates.py | 1 - .../charms/provider/published/charmcraft.yaml | 1 - .../integration/charms/provider/published/src/charm.py | 1 - .../provider/published/src/self_signed_certificates.py | 1 - .../tests/integration/charms/provider/pyproject.toml | 1 - .../charms/published-provider/charmcraft.yaml | 1 + .../published => published-provider}/pyproject.toml | 0 .../integration/charms/published-provider/src/charm.py | 1 + .../published-provider/src/self_signed_certificates.py | 1 + .../charms/published-requirer/charmcraft.yaml | 1 + .../published => published-requirer}/pyproject.toml | 0 .../integration/charms/published-requirer/src/charm.py | 1 + .../tests/integration/charms/pyproject.toml | 1 + .../charms/requirer/fetch-lib-latest/charmcraft.yaml | 1 - .../charms/requirer/fetch-lib-latest/src/charm.py | 1 - .../charms/requirer/fetch-lib-pre-fix/charmcraft.yaml | 1 - .../charms/requirer/fetch-lib-pre-fix/src/charm.py | 1 - .../integration/charms/requirer/local/charmcraft.yaml | 1 - .../charms/requirer/local/library/README.md | 1 - .../charms/requirer/local/library/pyproject.toml | 1 - .../integration/charms/requirer/local/library/src | 1 - .../integration/charms/requirer/local/src/charm.py | 1 - .../charms/requirer/published/charmcraft.yaml | 1 - .../integration/charms/requirer/published/src/charm.py | 1 - .../tests/integration/charms/requirer/pyproject.toml | 1 - interfaces/tls-certificates/tests/integration/pack.sh | 10 +++++----- 56 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 interfaces/tls-certificates/tests/integration/charms/common/local-library/README.md create mode 120000 interfaces/tls-certificates/tests/integration/charms/common/local-library/pyproject.toml create mode 120000 interfaces/tls-certificates/tests/integration/charms/common/local-library/src rename interfaces/tls-certificates/tests/integration/charms/{provider/charm.py => common/provider-charm.py} (100%) rename interfaces/tls-certificates/tests/integration/charms/{provider/charmcraft.yaml => common/provider-charmcraft.yaml} (100%) rename interfaces/tls-certificates/tests/integration/charms/{provider/self_signed_certificates.py => common/provider-self-signed-certificates.py} (100%) rename interfaces/tls-certificates/tests/integration/charms/{requirer/charm.py => common/requirer-charm.py} (100%) rename interfaces/tls-certificates/tests/integration/charms/{requirer/charmcraft.yaml => common/requirer-charmcraft.yaml} (100%) rename interfaces/tls-certificates/tests/integration/charms/{requirer/fetch_lib_charm.py => common/requirer-fetch-lib-charm.py} (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml rename interfaces/tls-certificates/tests/integration/charms/{requirer/fetch-lib-latest => fetch-lib-latest-requirer}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml rename interfaces/tls-certificates/tests/integration/charms/{requirer/fetch-lib-pre-fix => fetch-lib-pre-fix-requirer}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-provider/library rename interfaces/tls-certificates/tests/integration/charms/{provider/local => local-provider}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-requirer/library rename interfaces/tls-certificates/tests/integration/charms/{requirer/local => local-requirer}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/library/README.md delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/library/pyproject.toml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/library/src delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/local/src/self_signed_certificates.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/published/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/published/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/provider/published/src/self_signed_certificates.py delete mode 100644 interfaces/tls-certificates/tests/integration/charms/provider/pyproject.toml create mode 120000 interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml rename interfaces/tls-certificates/tests/integration/charms/{provider/published => published-provider}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py create mode 120000 interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml rename interfaces/tls-certificates/tests/integration/charms/{requirer/published => published-requirer}/pyproject.toml (100%) create mode 120000 interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py create mode 100644 interfaces/tls-certificates/tests/integration/charms/pyproject.toml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/local/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/local/library/README.md delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/local/library/pyproject.toml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/local/library/src delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/local/src/charm.py delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/published/charmcraft.yaml delete mode 120000 interfaces/tls-certificates/tests/integration/charms/requirer/published/src/charm.py delete mode 100644 interfaces/tls-certificates/tests/integration/charms/requirer/pyproject.toml diff --git a/interfaces/tls-certificates/pyproject.toml b/interfaces/tls-certificates/pyproject.toml index 4d64a97ad..4a53be69e 100644 --- a/interfaces/tls-certificates/pyproject.toml +++ b/interfaces/tls-certificates/pyproject.toml @@ -80,10 +80,11 @@ extends = "../../pyproject.toml" include = ["src", "tests", "interface"] pythonVersion = "3.10" # check no python > 3.10 features are used ignore = [ - "tests/integration/charms/*/published/src/charmlibs", + "tests/integration/charms/*/library/src/charmlibs", + # symlink sources; the charm code is checked via the dereferenced copies in each charm's src/ + "tests/integration/charms/common", # imports the Charmhub-hosted lib, which is only present in the packed charm - "tests/integration/charms/requirer/fetch_lib_charm.py", - "tests/integration/charms/requirer/fetch-lib-*", + "tests/integration/charms/fetch-lib-*", ] [tool.charmlibs.functional] diff --git a/interfaces/tls-certificates/tests/integration/charms/common/local-library/README.md b/interfaces/tls-certificates/tests/integration/charms/common/local-library/README.md new file mode 100644 index 000000000..fcb1c46bf --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/common/local-library/README.md @@ -0,0 +1,8 @@ +# Placeholder README for the library under test + +This directory is a local copy of the library under test. Test charms depend on it by creating a symlink to it and pointing their `tool.uv.sources` there. + +We need this local copy rather than just symlinking to the parent library directory so that when we `cp --recursive --dereference` the test charm to prepare it for packing, the library symlink is not recursive. + +- `pyproject.toml` and `src/` are symlinks to the real library at the package root so the charm always builds against the current source. +- `README.md` is this placeholder. A readme is required because the library decalares `readme = "README.md", and hatchling fails the build if that file is missing. \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/common/local-library/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/common/local-library/pyproject.toml new file mode 120000 index 000000000..be00ff53f --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/common/local-library/pyproject.toml @@ -0,0 +1 @@ +../../../../../pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/common/local-library/src b/interfaces/tls-certificates/tests/integration/charms/common/local-library/src new file mode 120000 index 000000000..d753b57a1 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/common/local-library/src @@ -0,0 +1 @@ +../../../../../src \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/charm.py b/interfaces/tls-certificates/tests/integration/charms/common/provider-charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/provider/charm.py rename to interfaces/tls-certificates/tests/integration/charms/common/provider-charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/common/provider-charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/provider/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/common/provider-charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/common/provider-self-signed-certificates.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/provider/self_signed_certificates.py rename to interfaces/tls-certificates/tests/integration/charms/common/provider-self-signed-certificates.py diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/charm.py b/interfaces/tls-certificates/tests/integration/charms/common/requirer-charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/charm.py rename to interfaces/tls-certificates/tests/integration/charms/common/requirer-charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/common/requirer-charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/common/requirer-charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch_lib_charm.py b/interfaces/tls-certificates/tests/integration/charms/common/requirer-fetch-lib-charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/fetch_lib_charm.py rename to interfaces/tls-certificates/tests/integration/charms/common/requirer-fetch-lib-charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml new file mode 120000 index 000000000..5f4b94692 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml @@ -0,0 +1 @@ +../common/requirer-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py new file mode 120000 index 000000000..8cf5f01ef --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py @@ -0,0 +1 @@ +../../common/requirer-fetch-lib-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml new file mode 120000 index 000000000..5f4b94692 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml @@ -0,0 +1 @@ +../common/requirer-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py new file mode 120000 index 000000000..8cf5f01ef --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py @@ -0,0 +1 @@ +../../common/requirer-fetch-lib-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml new file mode 120000 index 000000000..b11871e4d --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml @@ -0,0 +1 @@ +../common/provider-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/library b/interfaces/tls-certificates/tests/integration/charms/local-provider/library new file mode 120000 index 000000000..d1042de71 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-provider/library @@ -0,0 +1 @@ +../common/local-library \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/local-provider/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/provider/local/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/local-provider/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py new file mode 120000 index 000000000..ac1812253 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py @@ -0,0 +1 @@ +../../common/provider-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py new file mode 120000 index 000000000..0501d0b33 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py @@ -0,0 +1 @@ +../../common/provider-self-signed-certificates.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml new file mode 120000 index 000000000..5f4b94692 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml @@ -0,0 +1 @@ +../common/requirer-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/library b/interfaces/tls-certificates/tests/integration/charms/local-requirer/library new file mode 120000 index 000000000..d1042de71 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-requirer/library @@ -0,0 +1 @@ +../common/local-library \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/local-requirer/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/local/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/local-requirer/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py new file mode 120000 index 000000000..08c323208 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py @@ -0,0 +1 @@ +../../common/requirer-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/provider/local/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/README.md b/interfaces/tls-certificates/tests/integration/charms/provider/local/library/README.md deleted file mode 120000 index 8addd38ae..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/README.md +++ /dev/null @@ -1 +0,0 @@ -../../../../../../README.md \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/provider/local/library/pyproject.toml deleted file mode 120000 index d2c52e649..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/pyproject.toml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/src b/interfaces/tls-certificates/tests/integration/charms/provider/local/library/src deleted file mode 120000 index 63fbb1dd4..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/library/src +++ /dev/null @@ -1 +0,0 @@ -../../../../../../src \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/provider/local/src/charm.py deleted file mode 120000 index 002423edf..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/local/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/provider/local/src/self_signed_certificates.py deleted file mode 120000 index 7928ec4e3..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/local/src/self_signed_certificates.py +++ /dev/null @@ -1 +0,0 @@ -../../self_signed_certificates.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/published/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/provider/published/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/published/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/published/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/provider/published/src/charm.py deleted file mode 120000 index 002423edf..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/published/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/published/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/provider/published/src/self_signed_certificates.py deleted file mode 120000 index 7928ec4e3..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/published/src/self_signed_certificates.py +++ /dev/null @@ -1 +0,0 @@ -../../self_signed_certificates.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/provider/pyproject.toml deleted file mode 100644 index 160e241d0..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/provider/pyproject.toml +++ /dev/null @@ -1 +0,0 @@ -# empty file to satisfy extends in library/pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml new file mode 120000 index 000000000..b11871e4d --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml @@ -0,0 +1 @@ +../common/provider-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/provider/published/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/published-provider/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/provider/published/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/published-provider/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py new file mode 120000 index 000000000..ac1812253 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py @@ -0,0 +1 @@ +../../common/provider-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py new file mode 120000 index 000000000..0501d0b33 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py @@ -0,0 +1 @@ +../../common/provider-self-signed-certificates.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml new file mode 120000 index 000000000..5f4b94692 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml @@ -0,0 +1 @@ +../common/requirer-charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/published/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/published-requirer/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/requirer/published/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/published-requirer/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py new file mode 120000 index 000000000..08c323208 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py @@ -0,0 +1 @@ +../../common/requirer-charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/pyproject.toml new file mode 100644 index 000000000..4bdc5cf36 --- /dev/null +++ b/interfaces/tls-certificates/tests/integration/charms/pyproject.toml @@ -0,0 +1 @@ +# empty file to satisfy extends in */[local-]library/pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/src/charm.py deleted file mode 120000 index 311c89be2..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-latest/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../fetch_lib_charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/src/charm.py deleted file mode 120000 index 311c89be2..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/fetch-lib-pre-fix/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../fetch_lib_charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/requirer/local/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/local/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/README.md b/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/README.md deleted file mode 120000 index 8addd38ae..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/README.md +++ /dev/null @@ -1 +0,0 @@ -../../../../../../README.md \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/pyproject.toml deleted file mode 120000 index d2c52e649..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/pyproject.toml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/src b/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/src deleted file mode 120000 index 63fbb1dd4..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/local/library/src +++ /dev/null @@ -1 +0,0 @@ -../../../../../../src \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/local/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/requirer/local/src/charm.py deleted file mode 120000 index 002423edf..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/local/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/published/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/requirer/published/charmcraft.yaml deleted file mode 120000 index 0504ead2d..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/published/charmcraft.yaml +++ /dev/null @@ -1 +0,0 @@ -../charmcraft.yaml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/published/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/requirer/published/src/charm.py deleted file mode 120000 index 002423edf..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/published/src/charm.py +++ /dev/null @@ -1 +0,0 @@ -../../charm.py \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/charms/requirer/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/requirer/pyproject.toml deleted file mode 100644 index 160e241d0..000000000 --- a/interfaces/tls-certificates/tests/integration/charms/requirer/pyproject.toml +++ /dev/null @@ -1 +0,0 @@ -# empty file to satisfy extends in library/pyproject.toml \ No newline at end of file diff --git a/interfaces/tls-certificates/tests/integration/pack.sh b/interfaces/tls-certificates/tests/integration/pack.sh index 7935ec84d..293e0b1aa 100755 --- a/interfaces/tls-certificates/tests/integration/pack.sh +++ b/interfaces/tls-certificates/tests/integration/pack.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # This script is executed in this directory via `just pack-k8s` or `just pack-machine`. -# Extra args are passed to this script, e.g. `just pack-k8s foo` -> $1 is 'foo'. +# Extra args are passed to this script, e.g. `just pack-k8s foo` -> $1 is 'foo'. # In CI, the `just pack-` commands are invoked: # - If this file exists and `just integration-` would execute any tests # - Before running integration tests @@ -9,8 +9,8 @@ # Environment variables: # $CHARMLIBS_SUBSTRATE will have the value 'k8s' or 'machine' (set by pack-k8s or pack-machine) # In CI, $CHARMLIBS_TAG is set based on pyproject.toml:tool.charmlibs.integration.tags -# For local testing, set $CHARMLIBS_TAG directly or use the tag variable. For example: -# just tag=24.04 pack-k8s some extra args +# For local testing, set $CHARMLIBS_TAG directly or use the --tag option. For example: +# just pack-k8s --tag=24.04 set -xueo pipefail TMP_DIR=".tmp" # clean temporary directory where charms will be packed @@ -26,7 +26,7 @@ for charm in 'provider' 'requirer'; do : copy charm files to temporary directory for packing, dereferencing symlinks rm -rf "$charm_tmp_dir" - cp --recursive --dereference "charms/$charm/$variant" "$charm_tmp_dir" + cp --recursive --dereference "charms/$variant-$charm" "$charm_tmp_dir" : pack charm cd "$charm_tmp_dir" @@ -48,7 +48,7 @@ for variant_and_lib in 'fetch-lib-latest=4' 'fetch-lib-pre-fix=4.26'; do charm_tmp_dir="$TMP_DIR/requirer-$variant" rm -rf "$charm_tmp_dir" - cp --recursive --dereference "charms/requirer/$variant" "$charm_tmp_dir" + cp --recursive --dereference "charms/$variant-requirer" "$charm_tmp_dir" : declare the Charmhub lib at the pinned version, then fetch and pack printf '\ncharm-libs:\n - lib: tls_certificates_interface.tls_certificates\n version: "%s"\n' \ From 50204665ecb2a3bd9c664c0b2ccfb2d726f714c3 Mon Sep 17 00:00:00 2001 From: James Garner Date: Mon, 7 Sep 2026 12:23:52 +1200 Subject: [PATCH 2/2] test: put -charm at the end of charm directory names --- .../charmcraft.yaml | 0 .../pyproject.toml | 0 .../src/charm.py | 0 .../charmcraft.yaml | 0 .../pyproject.toml | 0 .../src/charm.py | 0 .../{local-provider => local-provider-charm}/charmcraft.yaml | 0 .../charms/{local-provider => local-provider-charm}/library | 0 .../{local-provider => local-provider-charm}/pyproject.toml | 0 .../{local-provider => local-provider-charm}/src/charm.py | 0 .../src/self_signed_certificates.py | 0 .../{local-requirer => local-requirer-charm}/charmcraft.yaml | 0 .../charms/{local-requirer => local-requirer-charm}/library | 0 .../{local-requirer => local-requirer-charm}/pyproject.toml | 0 .../{local-requirer => local-requirer-charm}/src/charm.py | 0 .../charmcraft.yaml | 0 .../pyproject.toml | 0 .../src/charm.py | 0 .../src/self_signed_certificates.py | 0 .../charmcraft.yaml | 0 .../pyproject.toml | 0 .../src/charm.py | 0 interfaces/tls-certificates/tests/integration/pack.sh | 4 ++-- 23 files changed, 2 insertions(+), 2 deletions(-) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-latest-requirer => fetch-lib-latest-requirer-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-latest-requirer => fetch-lib-latest-requirer-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-latest-requirer => fetch-lib-latest-requirer-charm}/src/charm.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-pre-fix-requirer => fetch-lib-pre-fix-requirer-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-pre-fix-requirer => fetch-lib-pre-fix-requirer-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{fetch-lib-pre-fix-requirer => fetch-lib-pre-fix-requirer-charm}/src/charm.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-provider => local-provider-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-provider => local-provider-charm}/library (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-provider => local-provider-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-provider => local-provider-charm}/src/charm.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-provider => local-provider-charm}/src/self_signed_certificates.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-requirer => local-requirer-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-requirer => local-requirer-charm}/library (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-requirer => local-requirer-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{local-requirer => local-requirer-charm}/src/charm.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-provider => published-provider-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-provider => published-provider-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-provider => published-provider-charm}/src/charm.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-provider => published-provider-charm}/src/self_signed_certificates.py (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-requirer => published-requirer-charm}/charmcraft.yaml (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-requirer => published-requirer-charm}/pyproject.toml (100%) rename interfaces/tls-certificates/tests/integration/charms/{published-requirer => published-requirer-charm}/src/charm.py (100%) diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-latest-requirer-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/fetch-lib-pre-fix-requirer-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/local-provider-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-provider/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/local-provider-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/library b/interfaces/tls-certificates/tests/integration/charms/local-provider-charm/library similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-provider/library rename to interfaces/tls-certificates/tests/integration/charms/local-provider-charm/library diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/local-provider-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-provider/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/local-provider-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/local-provider-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-provider/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/local-provider-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/local-provider-charm/src/self_signed_certificates.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-provider/src/self_signed_certificates.py rename to interfaces/tls-certificates/tests/integration/charms/local-provider-charm/src/self_signed_certificates.py diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-requirer/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/library b/interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/library similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-requirer/library rename to interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/library diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-requirer/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/local-requirer/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/local-requirer-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/published-provider-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-provider/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/published-provider-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/published-provider-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-provider/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/published-provider-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/published-provider-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-provider/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/published-provider-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py b/interfaces/tls-certificates/tests/integration/charms/published-provider-charm/src/self_signed_certificates.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-provider/src/self_signed_certificates.py rename to interfaces/tls-certificates/tests/integration/charms/published-provider-charm/src/self_signed_certificates.py diff --git a/interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml b/interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/charmcraft.yaml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-requirer/charmcraft.yaml rename to interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/charmcraft.yaml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-requirer/pyproject.toml b/interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/pyproject.toml similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-requirer/pyproject.toml rename to interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/pyproject.toml diff --git a/interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py b/interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/src/charm.py similarity index 100% rename from interfaces/tls-certificates/tests/integration/charms/published-requirer/src/charm.py rename to interfaces/tls-certificates/tests/integration/charms/published-requirer-charm/src/charm.py diff --git a/interfaces/tls-certificates/tests/integration/pack.sh b/interfaces/tls-certificates/tests/integration/pack.sh index 293e0b1aa..05fd66a41 100755 --- a/interfaces/tls-certificates/tests/integration/pack.sh +++ b/interfaces/tls-certificates/tests/integration/pack.sh @@ -26,7 +26,7 @@ for charm in 'provider' 'requirer'; do : copy charm files to temporary directory for packing, dereferencing symlinks rm -rf "$charm_tmp_dir" - cp --recursive --dereference "charms/$variant-$charm" "$charm_tmp_dir" + cp --recursive --dereference "charms/$variant-$charm-charm" "$charm_tmp_dir" : pack charm cd "$charm_tmp_dir" @@ -48,7 +48,7 @@ for variant_and_lib in 'fetch-lib-latest=4' 'fetch-lib-pre-fix=4.26'; do charm_tmp_dir="$TMP_DIR/requirer-$variant" rm -rf "$charm_tmp_dir" - cp --recursive --dereference "charms/$variant-requirer" "$charm_tmp_dir" + cp --recursive --dereference "charms/$variant-requirer-charm" "$charm_tmp_dir" : declare the Charmhub lib at the pinned version, then fetch and pack printf '\ncharm-libs:\n - lib: tls_certificates_interface.tls_certificates\n version: "%s"\n' \