Add Kinetic and Zed support
* sync charm-helpers to classic charms * rebuild for reactive charms * change openstack-origin/source default to zed * add new zed bundles * add zed bundles to tests.yaml * add zed tests to osci.yaml and .zuul.yaml * add run-on base for 22.10 * drop series from metadata.yaml in favor of run-on bases Change-Id: I054650d578c30b5c865cbd7a567eb5d7c8032d01
This commit is contained in:
parent
567e457800
commit
c171607528
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
- openstack-python3-charm-zed-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -21,13 +21,13 @@ parts:
|
||||||
bases:
|
bases:
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "20.04"
|
channel: "22.04"
|
||||||
architectures:
|
architectures:
|
||||||
- amd64
|
- amd64
|
||||||
run-on:
|
run-on:
|
||||||
- name: ubuntu
|
|
||||||
channel: "20.04"
|
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.10"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py38
|
- charm-unit-jobs-py38
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
- charm-xena-functional-jobs
|
|
||||||
- charm-yoga-functional-jobs
|
- charm-yoga-functional-jobs
|
||||||
|
- charm-zed-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: barbican
|
charm_build_name: barbican
|
||||||
|
|
|
@ -45,6 +45,6 @@ options:
|
||||||
description: |
|
description: |
|
||||||
Maximum allowed http request size against the barbican-api.
|
Maximum allowed http request size against the barbican-api.
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
default: yoga
|
default: zed
|
||||||
use-internal-endpoints:
|
use-internal-endpoints:
|
||||||
default: True
|
default: True
|
||||||
|
|
|
@ -8,8 +8,8 @@ description: |
|
||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- focal
|
|
||||||
- jammy
|
- jammy
|
||||||
|
- kinetic
|
||||||
subordinate: false
|
subordinate: false
|
||||||
requires:
|
requires:
|
||||||
shared-db:
|
shared-db:
|
||||||
|
|
|
@ -1,81 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
|
||||||
|
|
||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
barbican-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
barbican:
|
|
||||||
series: *series
|
|
||||||
charm: ../../../barbican.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
debug: true
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'barbican:shared-db'
|
|
||||||
- 'barbican-mysql-router:shared-db'
|
|
||||||
- - 'barbican-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'keystone:identity-service'
|
|
||||||
- 'barbican:identity-service'
|
|
||||||
|
|
||||||
- - 'rabbitmq-server:amqp'
|
|
||||||
- 'barbican:amqp'
|
|
|
@ -1,9 +1,9 @@
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: &series focal
|
series: &series jammy
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
'0':
|
|
@ -3,7 +3,7 @@ variables:
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: &series impish
|
series: &series kinetic
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
'0':
|
|
@ -1,15 +1,14 @@
|
||||||
charm_name: barbican
|
charm_name: barbican
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-xena
|
|
||||||
gate_bundles:
|
|
||||||
- focal-xena
|
|
||||||
- impish-xena
|
|
||||||
dev_bundles:
|
|
||||||
- focal-yoga
|
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
|
gate_bundles:
|
||||||
|
- jammy-yoga
|
||||||
|
dev_bundles:
|
||||||
|
- jammy-yoga
|
||||||
|
- jammy-zed
|
||||||
|
- kinetic-zed
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.barbican.tests.BarbicanTest
|
- zaza.openstack.charm_tests.barbican.tests.BarbicanTest
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- impish-xena
|
- kinetic-zed
|
||||||
- jammy-yoga
|
|
||||||
|
|
Loading…
Reference in New Issue