diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cf0871c2..b966d5c4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -79,6 +79,10 @@ jobs: steps: - name: Check out code uses: actions/checkout@v4 + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python }} - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: @@ -112,12 +116,6 @@ jobs: # # set model defaults # juju model-defaults apt-http-proxy=$PROXY apt-https-proxy=$PROXY juju-http-proxy=$PROXY juju-https-proxy=$PROXY snap-http-proxy=$PROXY snap-https-proxy=$PROXY # juju model-defaults - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python }} - - name: Install dependencies - run: pip install tox - name: Run integration # Force one single concurrent test run: tox -e integration @@ -134,16 +132,14 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python }} - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: provider: lxd juju-channel: 3.4/stable - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python }} - - name: Install dependencies - run: pip install tox - name: Run integration run: tox -e integration-quarantine diff --git a/tox.ini b/tox.ini index 3f76f492..c9e1079a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ # Tox (http://tox.testrun.org/) is a tool for running tests # in multiple virtualenvs. This configuration file will run the # test suite on all supported python versions. To use it, "pip install tox" +# (pre ubuntu 24.04 -- otherwise consider using pipx or apt instead of pip) # and then run "tox" from this directory. [tox]