Skip to content

Commit

Permalink
Drop bootstack-actions in CI func tests
Browse files Browse the repository at this point in the history
Using master branch for zaza with TEST_JUJU3=1 [1] and dropping
bootstack-actions for func in CI to be able to use specific lxd
channel.

---
[1]:
openstack-charmers/zaza@af7eea9
  • Loading branch information
rgildein committed Apr 11, 2024
1 parent 485fe90 commit d716e62
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 14 deletions.
34 changes: 22 additions & 12 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,29 @@ jobs:
working-directory: ./src

func:
uses: canonical/bootstack-actions/.github/workflows/func.yaml@v2
name: Functional tests
runs-on: ubuntu-latest
timeout-minutes: 120
needs: lint-unit
strategy:
fail-fast: false
matrix:
include:
- juju-channel: "3.1/stable"
command: "make functional"
with:
command: ${{ matrix.command }}
juju-channel: ${{ matrix.juju-channel }}
nested-containers: false
provider: "lxd"
python-version: "3.10"
timeout-minutes: 120
tox-version: "<4"
juju-channel: ['3.4/stable']
command: ['TEST_JUJU3=1 make functional'] # using TEST_JUJU3 due https://github.com/openstack-charmers/zaza/commit/af7eea953dd5d74d3d074fe67b5765dca3911ca6
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Setup Juju ${{ matrix.juju-channel }} LXD environment
uses: charmed-kubernetes/actions-operator@main
with:
provider: lxd
juju-channel: ${{ matrix.juju-channel }}
- name: Show juju information
run: |
juju version
juju controllers | grep Version -A 1 | awk '{print $9}'
- name: Run functional test
run: ${{ matrix.command }}
2 changes: 1 addition & 1 deletion src/tests/functional/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flake8
mock
git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
python-openstackclient
4 changes: 3 additions & 1 deletion src/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ passenv =
SNAP_HTTP_PROXY
SNAP_HTTPS_PROXY
OS_*
TEST_*

[testenv:lint]
commands =
Expand Down Expand Up @@ -76,4 +77,5 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
[testenv:func]
changedir = {toxinidir}/tests/functional
commands = functest-run-suite {posargs:--keep-faulty-model}
deps = -r {toxinidir}/tests/functional/requirements.txt
deps =
-r {toxinidir}/tests/functional/requirements.txt

0 comments on commit d716e62

Please sign in to comment.