Skip to content
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

Support juju 3.4 #25

Merged
merged 3 commits into from
Apr 23, 2024
+31 −42
Merged

Support juju 3.4 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cc7ea7
Add Juju 3.4 support
rgildein Apr 22, 2024
c40f3c7
Bundles clean-up + prep for running on LXD
rgildein Apr 22, 2024
afab4d3
Switch CI to LXD
rgildein Apr 22, 2024
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
26 changes: 11 additions & 15 deletions .github/workflows/check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
- '**.md'
- '**.rst'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
lint-unit:
uses: canonical/bootstack-actions/.github/workflows/lint-unit.yaml@v2
Expand All @@ -23,27 +27,19 @@ jobs:
python-version: ["3.8", "3.10"]
with:
python-version: ${{ matrix.python-version }}
tox-version: "<4"

func:
uses: canonical/bootstack-actions/.github/workflows/func.yaml@v3
uses: canonical/bootstack-actions/.github/workflows/func.yaml@v2
needs: lint-unit
strategy:
fail-fast: false
matrix:
command: ["TEST_JUJU3=1 make functional"] # TEST_JUJU3 needed due https://github.com/openstack-charmers/zaza/blob/b22c2eed4c322f1dfc14ffb2d31e0dd18c911a40/setup.py#L47 to support Juju3+
juju-channel: ["3.4/stable"]
with:
command: "make functional"
juju-channel: "3.1/stable"
command: ${{ matrix.command }}
juju-channel: ${{ matrix.juju-channel }}
nested-containers: false
provider: "microstack"
provider: "lxd"
python-version: "3.10"
timeout-minutes: 120
tox-version: "<4"
runs-on: "['self-hosted', 'runner-storage-connector']"
action-operator: false
external-controller: true
juju-controller: soleng-ci-ctrl
zaza-yaml: "LS0tCm1vZGVsX3NldHRpbmdzOgogIGltYWdlLXN0cmVhbTogcmVsZWFzZWQKcmVnaW9uOiBwcm9kc3RhY2s2CmNsb3VkOiBidWlsZGVyLWNsb3VkCmNyZWRlbnRpYWw6IGJ1aWxkZXItY2xvdWQtY3JlZAo="
secrets:
juju-controllers-yaml: ${{ secrets.JUJU_CONTROLLERS_YAML }}
juju-accounts-yaml: ${{ secrets.JUJU_ACCOUNTS_YAML }}
openstack-auth-env: ${{ secrets.OPENSTACK_AUTH_ENV }}
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ submodules-update:
@git submodule update --init --recursive --remote --merge

clean:
@echo "Cleaning files"
@git clean -ffXd -e '!.idea' -e '!.vscode'
@echo "Cleaning existing build"
@rm -rf ${PROJECTPATH}/${CHARM_NAME}*.charm
@echo "Cleaning charmcraft"
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
git+https://github.com/openstack-charmers/zaza.git@master#egg=zaza
13 changes: 13 additions & 0 deletions tests/functional/tests/bundles/base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
applications:
storage-connector:
charm: ch:storage-connector
ubuntu-target:
charm: ch:ubuntu
num_units: 1
ubuntu:
charm: ch:ubuntu
num_units: 1
constraints: root-disk=8G cores=2 virt-type=virtual-machine
relations:
- - 'ubuntu:juju-info'
- 'storage-connector:host'
1 change: 1 addition & 0 deletions tests/functional/tests/bundles/focal-fc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local_overlay_enabled: True
series: focal
applications:
storage-connector:
charm: ch:storage-connector
options:
storage-type: 'fc'
fc-lun-alias: 'data1'
Expand Down
12 changes: 0 additions & 12 deletions tests/functional/tests/bundles/focal.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/functional/tests/bundles/focal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
base.yaml
12 changes: 0 additions & 12 deletions tests/functional/tests/bundles/jammy.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/functional/tests/bundles/jammy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
base.yaml
1 change: 1 addition & 0 deletions tests/functional/tests/bundles/overlays/focal.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
series: focal
1 change: 1 addition & 0 deletions tests/functional/tests/bundles/overlays/jammy.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
series: jammy
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ passenv =
SNAP_HTTP_PROXY
SNAP_HTTPS_PROXY
OS_*
TEST_*

[testenv:dev-environment]
envdir = {toxinidir}/.venv
Expand Down
Loading