From ee405a6be95b3667a594e990561e6bacd2f6be74 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Wed, 7 Aug 2024 08:30:30 -0500 Subject: [PATCH 1/2] Bump juju charm versions to follow 3/stable * Provide more setup time for the deployed model * Test with python 3.12 in integration tests --- .github/workflows/tests.yaml | 4 ++-- tests/integration/test_pytest_operator.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 12ef4b8..1d3dc67 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -64,7 +64,7 @@ jobs: timeout-minutes: 40 strategy: matrix: - juju: ['3.1', '3.3'] + juju: ['3.1', '3'] steps: - name: Check out code uses: actions/checkout@v4 @@ -72,7 +72,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.12' - name: Setup operator test environment uses: charmed-kubernetes/actions-operator@main diff --git a/tests/integration/test_pytest_operator.py b/tests/integration/test_pytest_operator.py index 03d2260..f6987d1 100644 --- a/tests/integration/test_pytest_operator.py +++ b/tests/integration/test_pytest_operator.py @@ -44,7 +44,7 @@ async def test_build_and_deploy(self, ops_test): ) log.info("Deploying bundle") await ops_test.model.deploy(bundle) - await ops_test.model.wait_for_idle() + await ops_test.model.wait_for_idle(timeout=30 * 60) for unit in ops_test.model.units.values(): assert f"{unit.name}: {unit.workload_status}".endswith("active") From d7253d4899a8773146b4551c11a53584c278f9df Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Wed, 7 Aug 2024 09:20:42 -0500 Subject: [PATCH 2/2] update actions revisions --- .github/workflows/tests.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1d3dc67..db52d8e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,10 +27,10 @@ jobs: juju: ['2.9'] steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' @@ -70,9 +70,9 @@ jobs: uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.10' - name: Setup operator test environment uses: charmed-kubernetes/actions-operator@main