Skip to content

Commit

Permalink
Add charmcraft 3 support
Browse files Browse the repository at this point in the history
Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update config to default to caracal.
- Update osci.yaml to use the charmcraft 3.x/beta
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: Iacb73d68810b10c7fa79971bf0165f7ea5c7412a
  • Loading branch information
wolsen committed Jun 22, 2024
1 parent 84aec48 commit eca3eff
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 169 deletions.
40 changes: 14 additions & 26 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,18 @@ parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md

bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
base: [email protected]
platforms:
amd64:
build-on: amd64
build-for: amd64
arm64:
build-on: arm64
build-for: arm64
ppc64el:
build-on: ppc64el
build-for: ppc64el
s390x:
build-on: s390x
build-for: s390x
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ options:
Setting this to True will enable port forwarding (Rocky and later).
openstack-origin:
type: string
default: bobcat
default: caracal
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,
Expand Down
2 changes: 2 additions & 0 deletions hooks/charmhelpers/core/host_factory/ubuntu.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
'kinetic',
'lunar',
'mantic',
'noble',
'oracular',
)


Expand Down
2 changes: 1 addition & 1 deletion osci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: neutron-api
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/beta
45 changes: 0 additions & 45 deletions tests/bundles/jammy-antelope.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions tests/bundles/jammy-bobcat.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions tests/bundles/jammy-caracal.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion tests/bundles/noble-caracal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: 2024.1/edge
channel: latest/edge
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
Expand Down
6 changes: 1 addition & 5 deletions tests/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
charm_name: neutron-api

gate_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
- noble-caracal
smoke_bundles:
- jammy-caracal
dev_bundles:
Expand All @@ -24,5 +22,3 @@ tests_options:
application: neutron-api
policyd:
service: neutron
force_deploy:
- noble-caracal

0 comments on commit eca3eff

Please sign in to comment.