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: I9dc6e6aa5ab13ee4c6cd2cc6d14684dfcd5d35a8
  • Loading branch information
wolsen committed Jun 20, 2024
1 parent cb6aebb commit b572c75
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 243 deletions.
56 changes: 30 additions & 26 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,34 @@ parts:
plugin: dump
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- scripts/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- scripts/*
- 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: ubuntu@24.04
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: 2 additions & 0 deletions 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 config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ options:
Setting this to True will allow supporting services to log to syslog.
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: 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: keystone
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/beta
70 changes: 0 additions & 70 deletions tests/bundles/jammy-antelope.yaml

This file was deleted.

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

This file was deleted.

70 changes: 0 additions & 70 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 @@ -54,7 +54,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: 2024.1/edge
channel: latest/edge

relations:

Expand Down
6 changes: 2 additions & 4 deletions tests/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
charm_name: keystone

smoke_bundles:
- jammy-caracal
- noble-caracal
gate_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
- noble-caracal
dev_bundles:
- noble-caracal
comment: |
Expand Down

0 comments on commit b572c75

Please sign in to comment.