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 Change-Id: Ida68ffdab34c3136f3acf98629e4be6fda3bcea2
This commit is contained in:
parent
3756e8e4d7
commit
80751e7a17
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-jobs
|
- openstack-python3-charm-zed-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
libffi-dev [platform:dpkg]
|
||||||
|
libpq-dev [platform:dpkg]
|
||||||
|
libxml2-dev [platform:dpkg]
|
||||||
|
libxslt1-dev [platform:dpkg]
|
|
@ -21,13 +21,10 @@ 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]
|
||||||
|
|
|
@ -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: neutron-api-plugin-arista
|
charm_build_name: neutron-api-plugin-arista
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
# requirements.txt
|
# requirements.txt
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
|
# Build requirements
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
|
|
||||||
# NOTE: newer versions of cryptography require a Rust compiler to build,
|
# NOTE: newer versions of cryptography require a Rust compiler to build,
|
||||||
# see
|
# see
|
||||||
# * https://github.com/openstack-charmers/zaza/issues/421
|
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||||
|
@ -15,9 +18,8 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
|
||||||
#
|
#
|
||||||
cryptography<3.4
|
cryptography<3.4
|
||||||
|
|
||||||
# Build requirements
|
charm-tools==2.8.3; python_version < '3.10'
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
git+https://github.com/juju/charm-tools.git; python_version >= '3.10'
|
||||||
git+https://github.com/juju/charm-tools#egg=charm-tools
|
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,6 @@ tags:
|
||||||
- misc
|
- misc
|
||||||
- networking
|
- networking
|
||||||
subordinate: true
|
subordinate: true
|
||||||
series:
|
|
||||||
- focal
|
|
||||||
- jammy
|
|
||||||
provides:
|
provides:
|
||||||
neutron-plugin-api-subordinate:
|
neutron-plugin-api-subordinate:
|
||||||
interface: neutron-plugin-api-subordinate
|
interface: neutron-plugin-api-subordinate
|
||||||
|
|
|
@ -1,196 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
|
||||||
|
|
||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
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
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: ch:neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ch:neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: ch:nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista.charm
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: ch:placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-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
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - neutron-api:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - neutron-openvswitch:neutron-plugin-api
|
|
||||||
- neutron-api:neutron-plugin-api
|
|
||||||
- - neutron-api:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
|
@ -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
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
|
|
|
@ -3,7 +3,7 @@ variables:
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: &series impish
|
series: &series kinetic
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
charm_name: neutron-api-plugin-arista
|
charm_name: neutron-api-plugin-arista
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-xena
|
- jammy-yoga
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- focal-xena
|
- jammy-yoga
|
||||||
- impish-xena
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- focal-yoga
|
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
|
- jammy-zed
|
||||||
|
- kinetic-zed
|
||||||
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
||||||
|
@ -22,5 +22,4 @@ tests:
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- impish-xena
|
- kinetic-zed
|
||||||
- jammy-yoga
|
|
||||||
|
|
19
tox.ini
19
tox.ini
|
@ -34,7 +34,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
LAYER_PATH={toxinidir}/layers
|
LAYER_PATH={toxinidir}/layers
|
||||||
INTERFACE_PATH={toxinidir}/interfaces
|
INTERFACE_PATH={toxinidir}/interfaces
|
||||||
JUJU_REPOSITORY={toxinidir}/build
|
JUJU_REPOSITORY={toxinidir}/build
|
||||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
passenv = no_proxy http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
{toxinidir}/pip.sh install {opts} {packages}
|
||||||
allowlist_externals =
|
allowlist_externals =
|
||||||
|
@ -68,21 +68,6 @@ 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:py36]
|
|
||||||
basepython = python3.6
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py38]
|
|
||||||
basepython = python3.8
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py39]
|
|
||||||
basepython = python3.9
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py310]
|
[testenv:py310]
|
||||||
basepython = python3.10
|
basepython = python3.10
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
@ -91,7 +76,7 @@ commands = stestr run --slowest {posargs}
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
charm-tools==2.8.3
|
git+https://github.com/juju/charm-tools.git
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
[testenv:func-target]
|
[testenv:func-target]
|
||||||
|
|
Loading…
Reference in New Issue