Updates for jammy enablement

- charmcraft: build-on 20.04 -> run-on 20.04/22.04 [*archs]
- Refresh tox targets
- Drop impish bundles and OSCI testing
- Add jammy metadata

Change-Id: I4f6daba6c6d86d4ac749bdcd60d6e9441bf458ba
This commit is contained in:
James Page 2022-04-05 11:45:33 +01:00
parent d8d1dc0527
commit 1d36520687
11 changed files with 21 additions and 288 deletions

View File

@ -1,4 +1,4 @@
- project: - project:
templates: templates:
- openstack-python3-ussuri-jobs - openstack-python3-charm-yoga-jobs
- openstack-cover-jobs - openstack-cover-jobs

View File

@ -20,7 +20,15 @@ parts:
cp -r $CHARMCRAFT_STAGE/* . cp -r $CHARMCRAFT_STAGE/* .
bases: bases:
- build-on:
- name: ubuntu - name: ubuntu
channel: "20.04" channel: "20.04"
architectures: architectures:
- amd64 - amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -1,13 +1,11 @@
- project: - project:
templates: templates:
- charm-unit-jobs-py38 - charm-unit-jobs-py38
- charm-unit-jobs-py39 - charm-unit-jobs-py310
check: check:
jobs: jobs:
- focal - focal
- full_model-focal-full-ha - full_model-focal-full-ha
- full_model-impish-full-ha:
voting: false
- full_model-jammy-full-ha: - full_model-jammy-full-ha:
voting: false voting: false
vars: vars:
@ -22,13 +20,6 @@
- focal - focal
vars: vars:
tox_extra_args: full_model:focal-full-ha tox_extra_args: full_model:focal-full-ha
- job:
name: full_model-impish-full-ha
parent: func-target
dependencies:
- focal
vars:
tox_extra_args: full_model:impish-full-ha
- job: - job:
name: full_model-jammy-full-ha name: full_model-jammy-full-ha
parent: func-target parent: func-target

View File

@ -9,7 +9,7 @@ tags:
subordinate: false subordinate: false
series: series:
- focal - focal
- impish - jammy
provides: provides:
shared-db: shared-db:
interface: mysql-shared interface: mysql-shared

View File

@ -1 +0,0 @@
impish-full.yaml

View File

@ -1,180 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series impish
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
nova-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: ch:mysql-router
channel: latest/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ../../../mysql-innodb-cluster.charm
num_units: 3
options:
source: *openstack-origin
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
neutron-api-plugin-ovn:
charm: ch:neutron-api-plugin-ovn
channel: latest/edge
neutron-api:
charm: ch:neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
channel: latest/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
channel: latest/edge
ovn-chassis:
charm: ch:ovn-chassis
channel: latest/edge
nova-compute:
charm: ch:nova-compute
num_units: 1
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
channel: latest/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
memcached:
charm: cs:memcached
num_units: 1
series: focal
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:neutron-api
- nova-cloud-controller:neutron-api
- - neutron-api:identity-service
- keystone:identity-service
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
- - nova-compute:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:identity-service
- keystone:identity-service
- - nova-cloud-controller:cloud-compute
- nova-compute:cloud-compute
- - glance:identity-service
- keystone:identity-service
- - glance:amqp
- rabbitmq-server:amqp
- - nova-compute:image-service
- glance:image-service
- - nova-cloud-controller:image-service
- glance:image-service
- - placement:identity-service
- keystone:identity-service
- - placement:placement
- nova-cloud-controller:placement
- - neutron-api-plugin-ovn:neutron-plugin
- neutron-api:neutron-plugin-api-subordinate
- - ovn-central:certificates
- vault:certificates
- - ovn-central:ovsdb-cms
- neutron-api-plugin-ovn:ovsdb-cms
- - neutron-api:certificates
- vault:certificates
- - ovn-chassis:nova-compute
- nova-compute:neutron-plugin
- - ovn-chassis:certificates
- vault:certificates
- - ovn-chassis:ovsdb
- ovn-central:ovsdb
- - vault:certificates
- neutron-api-plugin-ovn:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- keystone:certificates
- - vault:certificates
- nova-cloud-controller:certificates
- - vault:certificates
- placement:certificates
- - vault:certificates
- mysql-innodb-cluster:certificates
- - memcached:cache
- nova-cloud-controller:memcache
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - glance:shared-db
- glance-mysql-router:shared-db
- - nova-cloud-controller:shared-db
- nova-mysql-router:shared-db
- - neutron-api:shared-db
- neutron-mysql-router:shared-db
- - placement:shared-db
- placement-mysql-router:shared-db
- - vault:shared-db
- vault-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - nova-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - glance-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - neutron-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - placement-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

View File

@ -1,34 +0,0 @@
local_overlay_enabled: False
series: impish
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ../../../mysql-innodb-cluster.charm
num_units: 3
keystone:
charm: ch:keystone
num_units: 1
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
channel: latest/edge
relations:
- - vault:certificates
- mysql-innodb-cluster:certificates
- - vault:certificates
- keystone:certificates
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - vault:shared-db
- vault-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

View File

@ -1,18 +0,0 @@
applications:
keystone:
num_units: 3
options:
vip: {{TEST_VIP00}}
nova-cloud-controller:
num_units: 3
options:
vip: {{TEST_VIP01}}
keystone-hacluster:
charm: ch:hacluster
channel: latest/edge
nova-hacluster:
charm: ch:hacluster
channel: latest/edge
relations:
- ["keystone:ha", "keystone-hacluster:ha"]
- ["nova-cloud-controller:ha", "nova-hacluster:ha"]

View File

@ -1,18 +0,0 @@
applications:
keystone:
num_units: 3
options:
vip: {{TEST_VIP00}}
nova-cloud-controller:
num_units: 3
options:
vip: {{TEST_VIP01}}
keystone-hacluster:
charm: ch:hacluster
channel: latest/edge
nova-hacluster:
charm: ch:hacluster
channel: latest/edge
relations:
- ["keystone:ha", "keystone-hacluster:ha"]
- ["nova-cloud-controller:ha", "nova-hacluster:ha"]

View File

@ -27,9 +27,9 @@ tests:
gate_bundles: gate_bundles:
- scale_in_out: focal - scale_in_out: focal
- scale_in_out: impish - scale_in_out: jammy
- full_model: focal-full-ha - full_model: focal-full-ha
- full_model: impish-full-ha - full_model: jammy-full-ha
smoke_bundles: smoke_bundles:
- focal - focal
@ -40,8 +40,8 @@ dev_bundles:
tests_options: tests_options:
force_deploy: force_deploy:
- impish - jammy
- impish-full-ha - jammy-full-ha
- jammy - jammy
- jammy-full-ha - jammy-full-ha

19
tox.ini
View File

@ -68,28 +68,13 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py37]
basepython = python3.7
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py38] [testenv:py38]
basepython = python3.8 basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py39] [testenv:py310]
basepython = python3.9 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}