Skip to content

Commit

Permalink
Merge "Updates for caracal testing support"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and openstack-gerrit committed Mar 14, 2024
2 parents 1945138 + bbce8b1 commit ac66f3b
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 76 deletions.
9 changes: 1 addition & 8 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ parts:
build-packages:
- tox
- git
source: src/
build-packages:
- python3-dev
source: src/
build-snaps:
- charm
build-environment:
Expand All @@ -23,9 +22,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, arm64, ppc64el, s390x]
- name: ubuntu
channel: "23.04"
architectures: [amd64, arm64, ppc64el, s390x]
- name: ubuntu
channel: "23.10"
architectures: [amd64, arm64, ppc64el, s390x]
2 changes: 1 addition & 1 deletion osci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- project:
templates:
- charm-unit-jobs
- charm-unit-jobs-py310
- charm-functional-jobs
vars:
needs_charm_build: true
Expand Down
2 changes: 0 additions & 2 deletions src/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ tags:
- openstack
series:
- jammy
- lunar
- mantic
subordinate: false
requires:
shared-db:
Expand Down
24 changes: 12 additions & 12 deletions src/tests/bundles/jammy-antelope.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ applications:

keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -68,7 +68,7 @@ applications:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
channel: latest/edge
channel: 2024.1/edge

neutron-api:
charm: ch:neutron-api
Expand All @@ -78,21 +78,21 @@ applications:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
channel: latest/edge
channel: 2024.1/edge

glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

nova-compute:
charm: ch:nova-compute
Expand All @@ -106,7 +106,7 @@ applications:
debug: true
config-flags: "compute_monitors=cpu.virt_driver"
libvirt-image-backend: "rbd"
channel: latest/edge
channel: 2024.1/edge

vault:
charm: ch:vault
Expand All @@ -126,11 +126,11 @@ applications:

neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
channel: 2024.1/edge

ceilometer:
charm: ch:ceilometer
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -140,11 +140,11 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

ceilometer-agent:
charm: ch:ceilometer-agent
channel: latest/edge
channel: 2024.1/edge

memcached:
charm: ch:memcached
Expand All @@ -158,15 +158,15 @@ applications:
osd-devices: '20G'
options:
source: *openstack-origin
channel: latest/edge
channel: reef/edge

ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
channel: latest/edge
channel: reef/edge

relations:
- - 'keystone:shared-db'
Expand Down
24 changes: 12 additions & 12 deletions src/tests/bundles/jammy-bobcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ applications:

keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -68,7 +68,7 @@ applications:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
channel: latest/edge
channel: 2024.1/edge

neutron-api:
charm: ch:neutron-api
Expand All @@ -78,21 +78,21 @@ applications:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
channel: latest/edge
channel: 2024.1/edge

glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

nova-compute:
charm: ch:nova-compute
Expand All @@ -106,7 +106,7 @@ applications:
debug: true
config-flags: "compute_monitors=cpu.virt_driver"
libvirt-image-backend: "rbd"
channel: latest/edge
channel: 2024.1/edge

vault:
charm: ch:vault
Expand All @@ -126,11 +126,11 @@ applications:

neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
channel: 2024.1/edge

ceilometer:
charm: ch:ceilometer
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -140,11 +140,11 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

ceilometer-agent:
charm: ch:ceilometer-agent
channel: latest/edge
channel: 2024.1/edge

memcached:
charm: ch:memcached
Expand All @@ -158,15 +158,15 @@ applications:
osd-devices: '20G'
options:
source: *openstack-origin
channel: latest/edge
channel: reef/edge

ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
channel: latest/edge
channel: reef/edge

relations:
- - 'keystone:shared-db'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal

series: &series mantic
series: &series jammy

applications:

Expand Down Expand Up @@ -42,7 +42,7 @@ applications:

keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -68,7 +68,7 @@ applications:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
channel: latest/edge
channel: 2024.1/edge

neutron-api:
charm: ch:neutron-api
Expand All @@ -78,21 +78,21 @@ applications:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
channel: latest/edge
channel: 2024.1/edge

glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

nova-compute:
charm: ch:nova-compute
Expand All @@ -106,7 +106,7 @@ applications:
debug: true
config-flags: "compute_monitors=cpu.virt_driver"
libvirt-image-backend: "rbd"
channel: latest/edge
channel: 2024.1/edge

vault:
charm: ch:vault
Expand All @@ -126,11 +126,11 @@ applications:

neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
channel: 2024.1/edge

ceilometer:
charm: ch:ceilometer
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
Expand All @@ -140,11 +140,11 @@ applications:
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
channel: 2024.1/edge

ceilometer-agent:
charm: ch:ceilometer-agent
channel: latest/edge
channel: 2024.1/edge

memcached:
charm: ch:memcached
Expand All @@ -158,15 +158,15 @@ applications:
osd-devices: '20G'
options:
source: *openstack-origin
channel: latest/edge
channel: reef/edge

ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
channel: latest/edge
channel: reef/edge

relations:
- - 'keystone:shared-db'
Expand Down
Loading

0 comments on commit ac66f3b

Please sign in to comment.