From 598edc3cc99445824b6a193026f9830b4ca63a7e Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Tue, 17 Dec 2024 14:55:33 +0900 Subject: [PATCH] chore: test both new and old loop --- .github/workflows/ci.yaml | 13 +++++++++++++ tox.ini | 1 + 2 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 075a2baf..23f21461 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -117,16 +117,28 @@ jobs: - series: jammy bases-index: 1 juju-snap-channel: ["2.9/stable", "3.4/stable", "3.6/stable"] + juju-new-wait-for-idle: ["True", "False"] include: - juju-snap-channel: "3.6/stable" agent-version: "3.6.0" libjuju-version: "3.5.2.0" + juju-new-wait-for-idle: "True" - juju-snap-channel: "3.4/stable" agent-version: "3.4.3" libjuju-version: "3.5.2.0" + juju-new-wait-for-idle: "True" + - juju-snap-channel: "3.6/stable" + agent-version: "3.6.0" + libjuju-version: "3.5.2.0" + juju-new-wait-for-idle: "False" + - juju-snap-channel: "3.4/stable" + agent-version: "3.4.3" + libjuju-version: "3.5.2.0" + juju-new-wait-for-idle: "False" - juju-snap-channel: "2.9/stable" agent-version: "2.9.51" libjuju-version: "2.9.49.0" + juju-new-wait-for-idle: "False" exclude: - groups: {path_to_test_file: tests/integration/test_data_integrator.py} ubuntu-versions: {series: focal} @@ -177,6 +189,7 @@ jobs: run: tox run -e integration -- "${{ matrix.groups.path_to_test_file }}" --group="${{ matrix.groups.group_number }}" -m '${{ steps.select-test-stability.outputs.mark_expression }}' --mysql-router-charm-series=${{ matrix.ubuntu-versions.series }} --mysql-router-charm-bases-index=${{ matrix.ubuntu-versions.bases-index }} env: LIBJUJU_VERSION_SPECIFIER: ${{ matrix.libjuju-version }} + JUJU_NEW_WAIT_FOR_IDLE: ${{ matrix.juju-new-wait-for-idle }} SECRETS_FROM_GITHUB: | { "UBUNTU_PRO_TOKEN" : "${{ secrets.UBUNTU_PRO_TOKEN }}", diff --git a/tox.ini b/tox.ini index 4312bfcb..177a6a5f 100644 --- a/tox.ini +++ b/tox.ini @@ -57,6 +57,7 @@ pass_env = CI GITHUB_OUTPUT SECRETS_FROM_GITHUB + JUJU_NEW_WAIT_FOR_IDLE commands_pre = poetry install --only integration commands =