Skip to content

Commit bc0e1c6

Browse files
ci: use Concierge to set up the smoke test environments (#1541)
The smoke tests are currently failing because of `sg` behaviour changes in the `ubuntu:latest` runners. Rather than figure out what the solution for that is, this PR simplifies the entire environment setup to just use Concierge instead. This also switches from testing against Juju 3.5 to 3/latest (which is 3.6), since 3.6 is available now and the intention was always to test against the latest 3. A [run can be seen in my fork](https://github.com/tonyandrewmeyer/operator/actions/runs/13003299600).
1 parent e8ac439 commit bc0e1c6

File tree

1 file changed

+7
-38
lines changed

1 file changed

+7
-38
lines changed

.github/workflows/smoke.yaml

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,16 @@ jobs:
1313
matrix:
1414
# pylibjuju does not currently support Juju 4.x
1515
# The smoke tests do not yet work on Juju 2.9.
16-
juju-version: ['3.5']
17-
charmcraft-version: ['2.x', '3.x']
18-
cloud: ['lxd', 'microk8s']
19-
20-
env:
21-
JUJU_VERSION: "${{ matrix.juju-version }}"
16+
juju-channel: ['3/stable']
17+
charmcraft-channel: ['2.x/stable', '3.x/stable']
18+
preset: ['machine', 'microk8s']
2219

2320
steps:
24-
# LXD is required for charmcraft to pack, even if it's not used as the
25-
# Juju cloud.
26-
- name: Set up LXD
27-
uses: canonical/setup-lxd@54a5806e490d92e207b57183cf111ed54bbdeff4
28-
with:
29-
channel: 5.0/stable
30-
31-
- name: Set up Microk8s
32-
if: matrix.cloud == 'microk8s'
33-
uses: balchua/[email protected]
34-
with:
35-
channel: '1.26-strict/stable'
36-
devMode: 'true'
37-
addons: '["dns", "hostpath-storage"]'
38-
39-
- name: Set up Juju (classic)
40-
if: matrix.juju-version == '2.9'
41-
run: sudo snap install juju --classic --channel=${{ matrix.juju-version }}
42-
43-
- name: Set up Juju
44-
if: matrix.juju-version != '2.9'
45-
run: sudo snap install juju --channel=${{ matrix.juju-version }}
46-
47-
- name: Bootstrap Juju controller (k8s)
48-
if: matrix.cloud == 'microk8s'
49-
run: sg snap_microk8s -c 'juju bootstrap microk8s'
50-
51-
- name: Bootstrap Juju controller (lxd)
52-
if: matrix.cloud == 'lxd'
53-
run: juju bootstrap localhost
21+
- name: Install concierge
22+
run: sudo snap install --classic concierge
5423

55-
- name: Install charmcraft
56-
run: sudo snap install charmcraft --channel=${{ matrix.charmcraft-version }} --classic
24+
- name: Install Juju and tools
25+
run: sudo concierge prepare --juju-channel=${{ matrix.juju-channel }} --charmcraft-channel=${{ matrix.charmcraft-channel }} -p "${{ matrix.preset }}"
5726

5827
- name: Checkout the repository
5928
uses: actions/checkout@v4

0 commit comments

Comments
 (0)