Add Kinetic and Zed support
* sync charm-helpers to classic charms * change openstack-origin/source default to zed * align testing with zed * add new zed bundles * add zed bundles to tests.yaml * add zed tests to osci.yaml and .zuul.yaml * update build-on and run-on bases * add bindep.txt for py310 * sync tox.ini and requirements.txt for ruamel * use charmcraft_channel 2.0/stable * drop reactive plugin overrides * move interface/layer env vars to charmcraft.yaml Change-Id: I5bf1b2a030c08461bc42c1e686af6220738ed98c
This commit is contained in:
parent
24505c3a24
commit
f64d041ca2
@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
- openstack-python3-charm-zed-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
4
bindep.txt
Normal file
4
bindep.txt
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
libffi-dev [platform:dpkg]
|
||||||
|
libpq-dev [platform:dpkg]
|
||||||
|
libxml2-dev [platform:dpkg]
|
||||||
|
libxslt1-dev [platform:dpkg]
|
@ -22,13 +22,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]
|
||||||
|
@ -16,8 +16,8 @@ tags:
|
|||||||
- storage
|
- storage
|
||||||
- file-servers
|
- file-servers
|
||||||
series:
|
series:
|
||||||
- focal
|
|
||||||
- jammy
|
- jammy
|
||||||
|
- kinetic
|
||||||
subordinate: true
|
subordinate: true
|
||||||
provides:
|
provides:
|
||||||
manila-plugin:
|
manila-plugin:
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py38
|
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
# More work is needed on the functional jobs; they can't pass at the
|
# More work is needed on the functional jobs; they can't pass at the
|
||||||
# moment as they need to set up hardware which isn't implemented yet.
|
# moment as they need to set up hardware which isn't implemented yet.
|
||||||
# See LP: #1922214
|
# See LP: #1922214
|
||||||
# - charm-xena-functional-jobs
|
# - charm-zed-functional-jobs
|
||||||
# - charm-yoga-functional-jobs
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: manila-netapp
|
charm_build_name: manila-netapp
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
|
charmcraft_channel: 2.0/stable
|
||||||
|
|
||||||
|
@ -13,25 +13,10 @@ stestr>=2.2.0
|
|||||||
# https://github.com/mtreinish/stestr/issues/145
|
# https://github.com/mtreinish/stestr/issues/145
|
||||||
cliff<3.0.0
|
cliff<3.0.0
|
||||||
|
|
||||||
# Dependencies of stestr. Newer versions use keywords that didn't exist in
|
|
||||||
# python 3.5 yet (e.g. "ModuleNotFoundError")
|
|
||||||
importlib-metadata<3.0.0; python_version < '3.6'
|
|
||||||
importlib-resources<3.0.0; python_version < '3.6'
|
|
||||||
|
|
||||||
# Some Zuul nodes sometimes pull newer versions of these dependencies which
|
|
||||||
# dropped support for python 3.5:
|
|
||||||
osprofiler<2.7.0;python_version<'3.6'
|
|
||||||
stevedore<1.31.0;python_version<'3.6'
|
|
||||||
debtcollector<1.22.0;python_version<'3.6'
|
|
||||||
oslo.utils<=3.41.0;python_version<'3.6'
|
|
||||||
|
|
||||||
requests>=2.18.4
|
requests>=2.18.4
|
||||||
charms.reactive
|
charms.reactive
|
||||||
|
|
||||||
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
|
mock>=1.2
|
||||||
# f'{something}'
|
|
||||||
mock>=1.2,<4.0.0; python_version < '3.6'
|
|
||||||
mock>=1.2; python_version >= '3.6'
|
|
||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
|
@ -67,7 +67,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -76,7 +76,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -89,11 +89,11 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -112,7 +112,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
@ -130,7 +130,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -143,7 +143,7 @@ applications:
|
|||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
- '11'
|
- '11'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ch:manila
|
charm: ch:manila
|
||||||
@ -153,7 +153,7 @@ applications:
|
|||||||
default-share-backend: netapp-ontap
|
default-share-backend: netapp-ontap
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila-netapp:
|
manila-netapp:
|
||||||
charm: ../../manila-netapp.charm
|
charm: ../../manila-netapp.charm
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||||
|
|
||||||
local_overlay_enabled: True
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: focal
|
series: jammy
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
@ -67,7 +67,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -76,7 +76,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -89,11 +89,11 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -112,7 +112,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
@ -130,7 +130,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -143,7 +143,7 @@ applications:
|
|||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
- '11'
|
- '11'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ch:manila
|
charm: ch:manila
|
||||||
@ -153,7 +153,7 @@ applications:
|
|||||||
default-share-backend: netapp-ontap
|
default-share-backend: netapp-ontap
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila-netapp:
|
manila-netapp:
|
||||||
charm: ../../manila-netapp.charm
|
charm: ../../manila-netapp.charm
|
@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
local_overlay_enabled: True
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: focal
|
series: kinetic
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
@ -67,7 +67,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
@ -76,7 +76,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@ -89,11 +89,11 @@ applications:
|
|||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: ch:neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
@ -103,7 +103,7 @@ applications:
|
|||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
@ -112,7 +112,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '7'
|
- '7'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
@ -130,7 +130,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@ -143,7 +143,7 @@ applications:
|
|||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
- '11'
|
- '11'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila:
|
manila:
|
||||||
charm: ch:manila
|
charm: ch:manila
|
||||||
@ -153,7 +153,7 @@ applications:
|
|||||||
default-share-backend: netapp-ontap
|
default-share-backend: netapp-ontap
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
|
|
||||||
manila-netapp:
|
manila-netapp:
|
||||||
charm: ../../manila-netapp.charm
|
charm: ../../manila-netapp.charm
|
@ -1,16 +1,17 @@
|
|||||||
charm_name: manila-netapp
|
charm_name: manila-netapp
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- focal-xena
|
- jammy-yoga
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- focal-yoga
|
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
|
- jammy-zed
|
||||||
|
- kinetic-zed
|
||||||
|
|
||||||
# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See
|
# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See
|
||||||
# rationale there.
|
# rationale there.
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-xena
|
- jammy-yoga
|
||||||
|
|
||||||
target_deploy_status: {}
|
target_deploy_status: {}
|
||||||
|
|
||||||
@ -30,5 +31,5 @@ tests:
|
|||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- jammy-yoga
|
- kinetic-zed
|
||||||
|
|
||||||
|
2
tox.ini
2
tox.ini
@ -112,7 +112,7 @@ basepython = python3
|
|||||||
deps = -r{toxinidir}/build-requirements.txt
|
deps = -r{toxinidir}/build-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
charmcraft clean
|
charmcraft clean
|
||||||
charmcraft -v build
|
charmcraft -v pack
|
||||||
{toxinidir}/rename.sh
|
{toxinidir}/rename.sh
|
||||||
|
|
||||||
[testenv:func-noop]
|
[testenv:func-noop]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user