Revert changes to Allure in #250 (#259)

Reverts part of #250

An Allure Report can only be generated for one of the test suite
combinations (otherwise results with identical test case IDs will
override each other. Any parametrization that pytest is not aware of
[because it was done in spread—i.e. juju version, ubuntu base] will
result in duplicate test case IDs)

Removing the 20.04 base does not change this—we are only able to
generate an Allure Report for one of the Juju versions we test with

TL;DR the Allure Report should only use tests from a single spread
variant. The variant naming was not changed, so the Allure Report config
should not have been changed

Author: carlcsaposs-canonical

.github/workflows/integration_test.yaml

@@ -128,7 +128,7 @@ jobs:
         # Only upload results from one spread system & one spread variant
         # Allure can only process one result per pytest test ID. If parameterization is done via
         # spread instead of pytest, there will be overlapping pytest test IDs.
-        if: ${{ (success() || (failure() && steps.spread.outcome == 'failure')) && startsWith(matrix.job.spread_job, 'github-ci:ubuntu-24.04:') && github.event_name == 'schedule' && github.run_attempt == '1' }}
+        if: ${{ (success() || (failure() && steps.spread.outcome == 'failure')) && startsWith(matrix.job.spread_job, 'github-ci:ubuntu-24.04:') && endsWith(matrix.job.spread_job, ':juju36_ubuntu22') && github.event_name == 'schedule' && github.run_attempt == '1' }}
         uses: actions/upload-artifact@v4
         with:
           name: allure-results-integration-test-${{ matrix.job.name_in_artifact }}

tests/spread/test_data_integrator.py/task.yaml

@@ -5,6 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-variants:
-  - -juju36_ubuntu20
-  - -juju29_ubuntu20

tests/spread/test_hacluster.py/task.yaml

@@ -5,6 +5,3 @@ execute: |
   tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
 artifacts:
   - allure-results
-variants:
-  - -juju36_ubuntu20
-  - -juju29_ubuntu20