Skip to content

Commit b442b50

Browse files
jadonnjadonn
committed
Updates for caracal testing support
These updates, on the master branch, are to support testing the caracal packages and support of the charms for caracal. They do NOT lock the charms down, and don't change the testing branches to stable branches. Change-Id: Ib4f6ab11e68e966e63d438497aa195ebb1e55f15
1 parent f0f593e commit b442b50

10 files changed

+99
-91
lines changed

‎build-requirements.txt

Whitespace-only changes.

‎charmcraft.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,9 @@ parts:
2020
bases:
2121
- build-on:
2222
- name: ubuntu
23-
channel: "20.04"
23+
channel: "22.04"
2424
architectures: [amd64]
25-
run-on:
26-
- name: ubuntu
27-
channel: "20.04"
28-
architectures: [amd64, s390x, ppc64el, arm64]
2925
run-on:
3026
- name: ubuntu
3127
channel: "22.04"
3228
architectures: [amd64, s390x, ppc64el, arm64]
33-
34-
- name: ubuntu
35-
channel: "23.04"
36-
architectures: [amd64, s390x, ppc64el, arm64]
37-
- name: ubuntu
38-
channel: "23.10"
39-
architectures: [amd64, s390x, ppc64el, arm64]

‎metadata.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ tags:
1818
series:
1919
- focal
2020
- jammy
21-
- mantic
2221
provides:
2322
keystone-fid-service-provider:
2423
interface: keystone-fid-service-provider

‎osci.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
needs_charm_build: true
77
charm_build_name: keystone-openidc
88
build_type: charmcraft
9+
charmcraft_channel: 2.x/stable

‎tests/bundles/jammy-antelope.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ applications:
8484
block-device: None
8585
to:
8686
- '3'
87-
channel: latest/edge
87+
channel: 2024.1/edge
8888

8989
glance:
9090
charm: ch:glance
@@ -93,7 +93,7 @@ applications:
9393
openstack-origin: *openstack-origin
9494
to:
9595
- '4'
96-
channel: latest/edge
96+
channel: 2024.1/edge
9797

9898
keystone:
9999
charm: ch:keystone
@@ -105,7 +105,7 @@ applications:
105105
- '5'
106106
- '6'
107107
- '7'
108-
channel: latest/edge
108+
channel: 2024.1/edge
109109

110110
neutron-api:
111111
charm: ch:neutron-api
@@ -117,7 +117,7 @@ applications:
117117
neutron-security-groups: true
118118
to:
119119
- '8'
120-
channel: latest/edge
120+
channel: 2024.1/edge
121121

122122
nova-cloud-controller:
123123
charm: ch:nova-cloud-controller
@@ -127,7 +127,7 @@ applications:
127127
network-manager: Neutron
128128
to:
129129
- '9'
130-
channel: latest/edge
130+
channel: 2024.1/edge
131131

132132
nova-compute:
133133
charm: ch:nova-compute
@@ -141,7 +141,7 @@ applications:
141141
to:
142142
- '10'
143143
- '11'
144-
channel: latest/edge
144+
channel: 2024.1/edge
145145

146146
ntp:
147147
charm: ch:ntp
@@ -156,7 +156,7 @@ applications:
156156
- '12'
157157
- '13'
158158
- '14'
159-
channel: latest/edge
159+
channel: 2024.1/edge
160160

161161
rabbitmq-server:
162162
charm: ch:rabbitmq-server
@@ -179,7 +179,7 @@ applications:
179179
openstack-origin: *openstack-origin
180180
to:
181181
- '17'
182-
channel: latest/edge
182+
channel: 2024.1/edge
183183

184184
keystone-openidc:
185185
charm: ../../keystone-openidc.charm
@@ -209,11 +209,11 @@ applications:
209209
bridge-mappings: physnet1:br-ex
210210
to:
211211
- '18'
212-
channel: latest/edge
212+
channel: 2024.1/edge
213213

214214
neutron-openvswitch:
215215
charm: ch:neutron-openvswitch
216-
channel: latest/edge
216+
channel: 2024.1/edge
217217

218218
openidc-test-fixture:
219219
charm: ch:openidc-test-fixture

‎tests/bundles/jammy-bobcat.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ applications:
8484
block-device: None
8585
to:
8686
- '3'
87-
channel: latest/edge
87+
channel: 2024.1/edge
8888

8989
glance:
9090
charm: ch:glance
@@ -93,7 +93,7 @@ applications:
9393
openstack-origin: *openstack-origin
9494
to:
9595
- '4'
96-
channel: latest/edge
96+
channel: 2024.1/edge
9797

9898
keystone:
9999
charm: ch:keystone
@@ -105,7 +105,7 @@ applications:
105105
- '5'
106106
- '6'
107107
- '7'
108-
channel: latest/edge
108+
channel: 2024.1/edge
109109

110110
neutron-api:
111111
charm: ch:neutron-api
@@ -117,7 +117,7 @@ applications:
117117
neutron-security-groups: true
118118
to:
119119
- '8'
120-
channel: latest/edge
120+
channel: 2024.1/edge
121121

122122
nova-cloud-controller:
123123
charm: ch:nova-cloud-controller
@@ -127,7 +127,7 @@ applications:
127127
network-manager: Neutron
128128
to:
129129
- '9'
130-
channel: latest/edge
130+
channel: 2024.1/edge
131131

132132
nova-compute:
133133
charm: ch:nova-compute
@@ -141,7 +141,7 @@ applications:
141141
to:
142142
- '10'
143143
- '11'
144-
channel: latest/edge
144+
channel: 2024.1/edge
145145

146146
ntp:
147147
charm: ch:ntp
@@ -156,7 +156,7 @@ applications:
156156
- '12'
157157
- '13'
158158
- '14'
159-
channel: latest/edge
159+
channel: 2024.1/edge
160160

161161
rabbitmq-server:
162162
charm: ch:rabbitmq-server
@@ -179,7 +179,7 @@ applications:
179179
openstack-origin: *openstack-origin
180180
to:
181181
- '17'
182-
channel: latest/edge
182+
channel: 2024.1/edge
183183

184184
keystone-openidc:
185185
charm: ../../keystone-openidc.charm
@@ -209,11 +209,11 @@ applications:
209209
bridge-mappings: physnet1:br-ex
210210
to:
211211
- '18'
212-
channel: latest/edge
212+
channel: 2024.1/edge
213213

214214
neutron-openvswitch:
215215
charm: ch:neutron-openvswitch
216-
channel: latest/edge
216+
channel: 2024.1/edge
217217

218218
openidc-test-fixture:
219219
charm: ch:openidc-test-fixture

‎tests/bundles/mantic-bobcat.yaml ‎tests/bundles/jammy-caracal.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
variables:
2-
openstack-origin: &openstack-origin distro
2+
openstack-origin: &openstack-origin cloud:jammy-caracal
33

44
local_overlay_enabled: True
55

6-
series: mantic
6+
series: jammy
77

88
comment:
99
- 'machines section to decide order of deployment. database sooner = faster'
@@ -84,7 +84,7 @@ applications:
8484
block-device: None
8585
to:
8686
- '3'
87-
channel: latest/edge
87+
channel: 2024.1/edge
8888

8989
glance:
9090
charm: ch:glance
@@ -93,7 +93,7 @@ applications:
9393
openstack-origin: *openstack-origin
9494
to:
9595
- '4'
96-
channel: latest/edge
96+
channel: 2024.1/edge
9797

9898
keystone:
9999
charm: ch:keystone
@@ -105,7 +105,7 @@ applications:
105105
- '5'
106106
- '6'
107107
- '7'
108-
channel: latest/edge
108+
channel: 2024.1/edge
109109

110110
neutron-api:
111111
charm: ch:neutron-api
@@ -117,7 +117,7 @@ applications:
117117
neutron-security-groups: true
118118
to:
119119
- '8'
120-
channel: latest/edge
120+
channel: 2024.1/edge
121121

122122
nova-cloud-controller:
123123
charm: ch:nova-cloud-controller
@@ -127,7 +127,7 @@ applications:
127127
network-manager: Neutron
128128
to:
129129
- '9'
130-
channel: latest/edge
130+
channel: 2024.1/edge
131131

132132
nova-compute:
133133
charm: ch:nova-compute
@@ -141,7 +141,7 @@ applications:
141141
to:
142142
- '10'
143143
- '11'
144-
channel: latest/edge
144+
channel: 2024.1/edge
145145

146146
ntp:
147147
charm: ch:ntp
@@ -156,7 +156,7 @@ applications:
156156
- '12'
157157
- '13'
158158
- '14'
159-
channel: latest/edge
159+
channel: 2024.1/edge
160160

161161
rabbitmq-server:
162162
charm: ch:rabbitmq-server
@@ -179,7 +179,7 @@ applications:
179179
openstack-origin: *openstack-origin
180180
to:
181181
- '17'
182-
channel: latest/edge
182+
channel: 2024.1/edge
183183

184184
keystone-openidc:
185185
charm: ../../keystone-openidc.charm
@@ -209,11 +209,11 @@ applications:
209209
bridge-mappings: physnet1:br-ex
210210
to:
211211
- '18'
212-
channel: latest/edge
212+
channel: 2024.1/edge
213213

214214
neutron-openvswitch:
215215
charm: ch:neutron-openvswitch
216-
channel: latest/edge
216+
channel: 2024.1/edge
217217

218218
openidc-test-fixture:
219219
charm: ch:openidc-test-fixture

‎tests/bundles/lunar-antelope.yaml ‎tests/bundles/noble-caracal.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ variables:
33

44
local_overlay_enabled: True
55

6-
series: lunar
6+
series: noble
77

88
comment:
99
- 'machines section to decide order of deployment. database sooner = faster'
@@ -84,7 +84,7 @@ applications:
8484
block-device: None
8585
to:
8686
- '3'
87-
channel: latest/edge
87+
channel: 2024.1/edge
8888

8989
glance:
9090
charm: ch:glance
@@ -93,7 +93,7 @@ applications:
9393
openstack-origin: *openstack-origin
9494
to:
9595
- '4'
96-
channel: latest/edge
96+
channel: 2024.1/edge
9797

9898
keystone:
9999
charm: ch:keystone
@@ -105,7 +105,7 @@ applications:
105105
- '5'
106106
- '6'
107107
- '7'
108-
channel: latest/edge
108+
channel: 2024.1/edge
109109

110110
neutron-api:
111111
charm: ch:neutron-api
@@ -117,7 +117,7 @@ applications:
117117
neutron-security-groups: true
118118
to:
119119
- '8'
120-
channel: latest/edge
120+
channel: 2024.1/edge
121121

122122
nova-cloud-controller:
123123
charm: ch:nova-cloud-controller
@@ -127,7 +127,7 @@ applications:
127127
network-manager: Neutron
128128
to:
129129
- '9'
130-
channel: latest/edge
130+
channel: 2024.1/edge
131131

132132
nova-compute:
133133
charm: ch:nova-compute
@@ -141,7 +141,7 @@ applications:
141141
to:
142142
- '10'
143143
- '11'
144-
channel: latest/edge
144+
channel: 2024.1/edge
145145

146146
ntp:
147147
charm: ch:ntp
@@ -156,7 +156,7 @@ applications:
156156
- '12'
157157
- '13'
158158
- '14'
159-
channel: latest/edge
159+
channel: 2024.1/edge
160160

161161
rabbitmq-server:
162162
charm: ch:rabbitmq-server
@@ -179,7 +179,7 @@ applications:
179179
openstack-origin: *openstack-origin
180180
to:
181181
- '17'
182-
channel: latest/edge
182+
channel: 2024.1/edge
183183

184184
keystone-openidc:
185185
charm: ../../keystone-openidc.charm
@@ -209,11 +209,11 @@ applications:
209209
bridge-mappings: physnet1:br-ex
210210
to:
211211
- '18'
212-
channel: latest/edge
212+
channel: 2024.1/edge
213213

214214
neutron-openvswitch:
215215
charm: ch:neutron-openvswitch
216-
channel: latest/edge
216+
channel: 2024.1/edge
217217

218218
openidc-test-fixture:
219219
charm: ch:openidc-test-fixture

0 commit comments

Comments
 (0)