Skip to content

Commit 347d5b4

Browse files
[MISC] Remove [email protected] base (#250)
1 parent df82505 commit 347d5b4

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/integration_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
# Only upload results from one spread system & one spread variant
129129
# Allure can only process one result per pytest test ID. If parameterization is done via
130130
# spread instead of pytest, there will be overlapping pytest test IDs.
131-
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' }}
131+
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' }}
132132
uses: actions/upload-artifact@v4
133133
with:
134134
name: allure-results-integration-test-${{ matrix.job.name_in_artifact }}

charmcraft.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
type: charm
55
platforms:
6-
76
87
98
# Files implicitly created by charmcraft without a part:

spread.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ backends:
9494
- ubuntu-24.04-arm:
9595
username: runner
9696
variants:
97-
- -juju36_ubuntu20
9897
- -juju29_ubuntu22
99-
- -juju29_ubuntu20
10098

10199
suites:
102100
tests/spread/:
@@ -107,10 +105,9 @@ path: /root/spread_project
107105
kill-timeout: 3h
108106
environment:
109107
PATH: $PATH:$(pipx environment --value PIPX_BIN_DIR)
110-
CONCIERGE_JUJU_CHANNEL/juju36_ubuntu22,juju36_ubuntu20: 3.6/stable
111-
CONCIERGE_JUJU_CHANNEL/juju29_ubuntu22,juju29_ubuntu20: 2.9/stable
108+
CONCIERGE_JUJU_CHANNEL/juju36_ubuntu22: 3.6/stable
109+
CONCIERGE_JUJU_CHANNEL/juju29_ubuntu22: 2.9/stable
112110
CHARM_UBUNTU_BASE/juju36_ubuntu22,juju29_ubuntu22: 22.04
113-
CHARM_UBUNTU_BASE/juju36_ubuntu20,juju29_ubuntu20: 20.04
114111
prepare: |
115112
snap refresh --hold
116113
chown -R root:root "$SPREAD_PATH"

0 commit comments

Comments
 (0)