Add Antelope support
* sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: Ibdb020b7aa563b67c85f8a0922898f157c5599b7
This commit is contained in:
parent
f84cee2634
commit
bbefc1ecf3
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-zed-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -31,6 +31,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [amd64]
|
architectures: [amd64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [amd64]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -42,6 +45,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [arm64]
|
architectures: [arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [arm64]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -53,6 +59,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [ppc64el]
|
architectures: [ppc64el]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
- build-on:
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
|
@ -64,3 +73,6 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [s390x]
|
architectures: [s390x]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
- charm-zed-functional-jobs
|
- charm-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: designate
|
charm_build_name: designate
|
||||||
|
|
|
@ -155,4 +155,4 @@ options:
|
||||||
description: |
|
description: |
|
||||||
Set the project ID to own all managed resources like auto-created records etc.
|
Set the project ID to own all managed resources like auto-created records etc.
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
default: zed
|
default: antelope
|
||||||
|
|
|
@ -14,6 +14,7 @@ tags:
|
||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
- kinetic
|
||||||
|
- lunar
|
||||||
subordinate: false
|
subordinate: false
|
||||||
provides:
|
provides:
|
||||||
dnsaas:
|
dnsaas:
|
||||||
|
|
|
@ -0,0 +1,139 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:jammy-antelope
|
||||||
|
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
series: jammy
|
||||||
|
|
||||||
|
machines:
|
||||||
|
'0':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'1':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'2':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'3':
|
||||||
|
'4':
|
||||||
|
'5':
|
||||||
|
'6':
|
||||||
|
'7':
|
||||||
|
series: focal
|
||||||
|
'8':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
designate-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
charm: ch:mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
- '1'
|
||||||
|
- '2'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
designate-bind:
|
||||||
|
charm: ch:designate-bind
|
||||||
|
num_units: 1
|
||||||
|
# NOTE(ajkavanagh) apparently it has no openstack origin!
|
||||||
|
#options:
|
||||||
|
#openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
memcached:
|
||||||
|
charm: ch:memcached
|
||||||
|
num_units: 1
|
||||||
|
# Note that holding memcached at focal as it's not available at jammy yet.
|
||||||
|
series: focal
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
designate:
|
||||||
|
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
nrpe:
|
||||||
|
charm: ch:nrpe
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'designate:shared-db'
|
||||||
|
- 'designate-mysql-router:shared-db'
|
||||||
|
- - 'designate-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'designate:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'designate:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'designate:dns-backend'
|
||||||
|
- 'designate-bind:dns-backend'
|
||||||
|
|
||||||
|
- - 'designate:coordinator-memcached'
|
||||||
|
- 'memcached:cache'
|
||||||
|
|
||||||
|
- - 'designate:dnsaas'
|
||||||
|
- 'neutron-api:external-dns'
|
||||||
|
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'designate:nrpe-external-master'
|
||||||
|
- 'nrpe:nrpe-external-master'
|
|
@ -86,7 +86,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
designate:
|
designate:
|
||||||
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
||||||
|
|
|
@ -86,7 +86,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
designate:
|
designate:
|
||||||
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
||||||
|
|
|
@ -3,7 +3,7 @@ variables:
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: jammy
|
series: lunar
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
'0':
|
||||||
|
@ -35,8 +35,6 @@ applications:
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
|
@ -82,13 +80,13 @@ applications:
|
||||||
memcached:
|
memcached:
|
||||||
charm: ch:memcached
|
charm: ch:memcached
|
||||||
num_units: 1
|
num_units: 1
|
||||||
# Note that holding memcached at focal as it's not available at jammy yet.
|
# Note that holding memcached at focal as it's not available at lunar yet.
|
||||||
series: focal
|
series: focal
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
designate:
|
designate:
|
||||||
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
|
|
@ -1,15 +1,15 @@
|
||||||
charm_name: designate
|
charm_name: designate
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-yoga
|
- jammy-antelope
|
||||||
- jammy-zed
|
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.designate.tests.DesignateTests
|
- zaza.openstack.charm_tests.designate.tests.DesignateTests
|
||||||
|
@ -23,6 +23,7 @@ tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
# nrpe charm doesn't support jammy+ and needs to be force installed
|
# nrpe charm doesn't support jammy+ and needs to be force installed
|
||||||
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
||||||
- jammy-yoga
|
|
||||||
- jammy-zed
|
- jammy-zed
|
||||||
|
- jammy-antelope
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
Loading…
Reference in New Issue