From e977baf262f9bb569bb844d2c6ef4c00d0eb1cd4 Mon Sep 17 00:00:00 2001 From: Robert Gildein Date: Mon, 15 Apr 2024 20:16:20 +0200 Subject: [PATCH] test of my fix for zaza --- .github/workflows/check.yaml | 8 +++++--- src/tests/functional/tests/configure.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 120ba59..8581066 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -33,8 +33,11 @@ jobs: strategy: fail-fast: false matrix: - juju-channel: ['3.4/stable'] - command: ['TEST_JUJU3=1 make functional'] # using TEST_JUJU3 due https://github.com/openstack-charmers/zaza/commit/af7eea953dd5d74d3d074fe67b5765dca3911ca6 + include: + - juju-channel: ['3.4/stable'] + command: 'TEST_JUJU3=1 make functional' # using TEST_JUJU3 due https://github.com/openstack-charmers/zaza/commit/af7eea953dd5d74d3d074fe67b5765dca3911ca6 + - juju-channel: '2.9/stable' + command: 'make functional' steps: - uses: actions/checkout@v4 - name: Setup Python @@ -46,7 +49,6 @@ jobs: with: provider: lxd juju-channel: ${{ matrix.juju-channel }} - lxd-channel: "5.20/stable" # tmp fix until https://github.com/canonical/charmcraft/issues/1640 - name: Show juju information run: | juju version diff --git a/src/tests/functional/tests/configure.py b/src/tests/functional/tests/configure.py index 1bbb104..98bf797 100644 --- a/src/tests/functional/tests/configure.py +++ b/src/tests/functional/tests/configure.py @@ -14,7 +14,7 @@ def set_ubuntu_password_on_backup_host(): """Set ubuntu password on backup host.""" command = 'echo "{}" | chpasswd'.format(ubuntu_user_pass) backup_host_unit = _get_unit("backup-host") - result = zaza.model.run_on_unit(backup_host_unit.name, command, timeout=15) + result = zaza.model.run_on_unit(backup_host_unit.name, command, timeout=60) _check_run_result(result)