Skip to content

Commit 0a004b2

Browse files
committed
Add charmcraft 3 support
Update the charmcraft.yaml file to use base and platforms, only allowing noble support. - Update osci.yaml to use the charmcraft 3.x/beta - Add noble/oracular to charmhelpers - Drop non-noble tests Change-Id: I9df19317452af23169f4e90f6321c2ee222d14b0
1 parent dd1b4d7 commit 0a004b2

File tree

8 files changed

+26
-696
lines changed

8 files changed

+26
-696
lines changed

charmcraft.yaml

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,18 @@ parts:
44
charm:
55
plugin: dump
66
source: .
7-
prime:
8-
- actions/*
9-
- charmhelpers/*
10-
- files/*
11-
- hooks/*
12-
- lib/*
13-
- templates/*
14-
- actions.yaml
15-
- config.yaml
16-
- copyright
17-
- icon.svg
18-
- LICENSE
19-
- Makefile
20-
- metadata.yaml
21-
- README.md
227

23-
bases:
24-
- build-on:
25-
- name: ubuntu
26-
channel: "22.04"
27-
architectures:
28-
- amd64
29-
run-on:
30-
- name: ubuntu
31-
channel: "22.04"
32-
architectures: [amd64, s390x, ppc64el, arm64]
8+
9+
platforms:
10+
amd64:
11+
build-on: amd64
12+
build-for: amd64
13+
arm64:
14+
build-on: arm64
15+
build-for: arm64
16+
ppc64el:
17+
build-on: ppc64el
18+
build-for: ppc64el
19+
s390x:
20+
build-on: s390x
21+
build-for: s390x

hooks/charmhelpers/core/host_factory/ubuntu.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
'kinetic',
3434
'lunar',
3535
'mantic',
36+
'noble',
37+
'oracular',
3638
)
3739

3840

osci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
needs_charm_build: true
77
charm_build_name: neutron-openvswitch
88
build_type: charmcraft
9-
charmcraft_channel: 2.x/stable
9+
charmcraft_channel: 3.x/beta

tests/bundles/jammy-antelope.yaml

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)