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:
Corey Bryant
parent
979c77656e
commit
ccefc2109c
|
|
@ -1,3 +1,3 @@
|
|||
- project:
|
||||
templates:
|
||||
- openstack-python3-charm-yoga-jobs
|
||||
- openstack-python3-charm-zed-jobs
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
libffi-dev [platform:dpkg]
|
||||
libpq-dev [platform:dpkg]
|
||||
libxml2-dev [platform:dpkg]
|
||||
libxslt1-dev [platform:dpkg]
|
||||
|
|
@ -2,33 +2,24 @@ type: charm
|
|||
|
||||
parts:
|
||||
charm:
|
||||
build-packages:
|
||||
- tox
|
||||
- git
|
||||
- python3-dev
|
||||
- libffi-dev
|
||||
override-build: |
|
||||
apt-get install ca-certificates -y
|
||||
tox -e build-reactive
|
||||
override-stage: |
|
||||
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
|
||||
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
|
||||
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
|
||||
override-prime: |
|
||||
# For some reason, the normal priming chokes on the fact that there's a
|
||||
# hooks directory.
|
||||
cp -r $CHARMCRAFT_STAGE/* .
|
||||
source: src/
|
||||
plugin: reactive
|
||||
build-snaps:
|
||||
- charm
|
||||
build-environment:
|
||||
- CHARM_INTERFACES_DIR: /root/project/interfaces/
|
||||
- CHARM_LAYERS_DIR: /root/project/layers/
|
||||
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
channel: "22.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "22.10"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
|
|
|||
45
osci.yaml
45
osci.yaml
|
|
@ -1,50 +1,9 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs-py38
|
||||
- charm-unit-jobs-py310
|
||||
check:
|
||||
jobs:
|
||||
- focal-xena-pacemaker-remote-ssl_masakari
|
||||
- focal-yoga-pacemaker-remote-ssl_masakari:
|
||||
voting: false
|
||||
- impish-xena-pacemaker-remote-ssl_masakari:
|
||||
voting: false
|
||||
- jammy-yoga-pacemaker-remote-ssl_masakari:
|
||||
voting: false
|
||||
- charm-zed-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: masakari
|
||||
build_type: charmcraft
|
||||
|
||||
- job:
|
||||
name: focal-xena-pacemaker-remote-ssl_masakari
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- tox-py38
|
||||
- name: tox-py310
|
||||
soft: true
|
||||
- charm-build
|
||||
vars:
|
||||
tox_extra_args: focal-xena-pacemaker-remote-ssl
|
||||
- job:
|
||||
name: focal-yoga-pacemaker-remote-ssl_masakari
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-xena-pacemaker-remote-ssl_masakari
|
||||
vars:
|
||||
tox_extra_args: focal-yoga-pacemaker-remote-ssl
|
||||
- job:
|
||||
name: impish-xena-pacemaker-remote-ssl_masakari
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-xena-pacemaker-remote-ssl_masakari
|
||||
vars:
|
||||
tox_extra_args: impish-xena-pacemaker-remote-ssl
|
||||
- job:
|
||||
name: jammy-yoga-pacemaker-remote-ssl_masakari
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-xena-pacemaker-remote-ssl_masakari
|
||||
vars:
|
||||
tox_extra_args: jammy-yoga-pacemaker-remote-ssl
|
||||
charmcraft_channel: 2.0/stable
|
||||
|
|
|
|||
|
|
@ -15,16 +15,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
|
|||
#
|
||||
cryptography<3.4
|
||||
|
||||
# Build requirements
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
git+https://github.com/juju/charm-tools#egg=charm-tools
|
||||
git+https://github.com/juju/charm-tools.git
|
||||
|
||||
simplejson
|
||||
|
||||
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
|
||||
# "ModuleNotFoundError")
|
||||
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
|
||||
# some tox targets use only test-requirements.txt whereas charm-build uses only
|
||||
# requirements.txt
|
||||
importlib-metadata<3.0.0; python_version < '3.6'
|
||||
importlib-resources<3.0.0; python_version < '3.6'
|
||||
|
|
|
|||
|
|
@ -32,4 +32,4 @@ options:
|
|||
The period where expired notifications are checked and processed,
|
||||
specified in seconds.
|
||||
openstack-origin:
|
||||
default: yoga
|
||||
default: zed
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ description: |
|
|||
tags:
|
||||
- openstack
|
||||
series:
|
||||
- focal
|
||||
- jammy
|
||||
- kinetic
|
||||
|
|
|
|||
|
|
@ -1,418 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
constraints: mem=4096M
|
||||
'9':
|
||||
constraints: mem=4096M
|
||||
'10':
|
||||
constraints: mem=4096M
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
'20':
|
||||
'21':
|
||||
'22':
|
||||
'23':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
cinder-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
masakari-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-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
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
|
||||
cinder:
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
block-device: "None"
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
debug: true
|
||||
to:
|
||||
- '23'
|
||||
channel: latest/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 3
|
||||
constraints: mem=4G
|
||||
options:
|
||||
config-flags: default_ephemeral_format=ext4
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
cpu-model: kvm64
|
||||
cpu-mode: custom
|
||||
# Allow for more retries when testing ontop of openstack
|
||||
config-flags: block_device_allocate_retries=120
|
||||
to:
|
||||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
channel: latest/edge
|
||||
|
||||
masakari:
|
||||
charm: ../../../masakari.charm
|
||||
series: focal
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
- '13'
|
||||
- '14'
|
||||
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
expected-osd-count: 3
|
||||
to:
|
||||
- '15'
|
||||
- '16'
|
||||
- '17'
|
||||
channel: latest/edge
|
||||
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
constraints: mem=1G
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
storage:
|
||||
osd-devices: cinder,40G
|
||||
to:
|
||||
- '18'
|
||||
- '19'
|
||||
- '20'
|
||||
channel: latest/edge
|
||||
|
||||
cinder-ceph:
|
||||
charm: ch:cinder-ceph
|
||||
channel: latest/edge
|
||||
|
||||
masakari-monitors:
|
||||
charm: ch:masakari-monitors
|
||||
channel: latest/edge
|
||||
|
||||
hacluster:
|
||||
charm: ch:hacluster
|
||||
options:
|
||||
corosync_transport: unicast
|
||||
cluster_count: 3
|
||||
channel: latest/edge
|
||||
|
||||
pacemaker-remote:
|
||||
charm: cs:~openstack-charmers-next/pacemaker-remote
|
||||
options:
|
||||
enable-stonith: False
|
||||
enable-resources: False
|
||||
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: ch:vault
|
||||
to:
|
||||
- '21'
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '22'
|
||||
channel: latest/edge
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp-nova'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - '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'
|
||||
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'neutron-api:shared-db'
|
||||
- 'neutron-api-mysql-router:shared-db'
|
||||
- - 'neutron-api-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-api:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'neutron-openvswitch:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db'
|
||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:neutron-api'
|
||||
- 'neutron-api:neutron-api'
|
||||
|
||||
- - 'nova-cloud-controller:cloud-compute'
|
||||
- 'nova-compute:cloud-compute'
|
||||
|
||||
- - 'masakari:shared-db'
|
||||
- 'masakari-mysql-router:shared-db'
|
||||
- - 'masakari-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'masakari:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'masakari:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'glance:ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'ceph-mon:osd'
|
||||
- 'ceph-osd:mon'
|
||||
|
||||
- - 'cinder:storage-backend'
|
||||
- 'cinder-ceph:storage-backend'
|
||||
|
||||
- - 'cinder-ceph:ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'cinder-ceph:ceph-access'
|
||||
- 'nova-compute:ceph-access'
|
||||
|
||||
- - 'nova-compute:juju-info'
|
||||
- 'masakari-monitors:container'
|
||||
|
||||
- - 'masakari:ha'
|
||||
- 'hacluster:ha'
|
||||
|
||||
- - 'keystone:identity-credentials'
|
||||
- 'masakari-monitors:identity-credentials'
|
||||
|
||||
- - 'nova-compute:juju-info'
|
||||
- 'pacemaker-remote:juju-info'
|
||||
|
||||
- - 'hacluster:pacemaker-remote'
|
||||
- 'pacemaker-remote:pacemaker-remote'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'keystone:certificates'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'neutron-api:certificates'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'cinder:certificates'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'glance:certificates'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'nova-cloud-controller:certificates'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'masakari:certificates'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'vault:certificates'
|
||||
- 'placement:certificates'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: False
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: jammy
|
||||
|
||||
|
|
@ -69,8 +69,6 @@ applications:
|
|||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
|
|
@ -230,10 +228,11 @@ applications:
|
|||
channel: latest/edge
|
||||
|
||||
pacemaker-remote:
|
||||
charm: cs:~openstack-charmers-next/pacemaker-remote
|
||||
charm: ch:pacemaker-remote
|
||||
options:
|
||||
enable-stonith: False
|
||||
enable-resources: False
|
||||
channel: latest/edge
|
||||
|
||||
vault:
|
||||
num_units: 1
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||
|
||||
local_overlay_enabled: False
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: focal
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
|
@ -69,8 +69,6 @@ applications:
|
|||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
|
|
@ -180,7 +178,6 @@ applications:
|
|||
|
||||
masakari:
|
||||
charm: ../../../masakari.charm
|
||||
series: focal
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
@ -231,10 +228,11 @@ applications:
|
|||
channel: latest/edge
|
||||
|
||||
pacemaker-remote:
|
||||
charm: cs:~openstack-charmers-next/pacemaker-remote
|
||||
charm: ch:pacemaker-remote
|
||||
options:
|
||||
enable-stonith: False
|
||||
enable-resources: False
|
||||
channel: latest/edge
|
||||
|
||||
vault:
|
||||
num_units: 1
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: False
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: impish
|
||||
series: kinetic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
|
@ -69,8 +69,6 @@ applications:
|
|||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
|
|
@ -230,10 +228,11 @@ applications:
|
|||
channel: latest/edge
|
||||
|
||||
pacemaker-remote:
|
||||
charm: cs:~openstack-charmers-next/pacemaker-remote
|
||||
charm: ch:pacemaker-remote
|
||||
options:
|
||||
enable-stonith: False
|
||||
enable-resources: False
|
||||
channel: latest/edge
|
||||
|
||||
vault:
|
||||
num_units: 1
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
applications:
|
||||
masakari:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
|
|
@ -13,18 +13,15 @@ configure:
|
|||
- zaza.openstack.charm_tests.masakari.setup.create_segments
|
||||
|
||||
gate_bundles:
|
||||
- focal-wallaby-pacemaker-remote-ssl
|
||||
- focal-xena-pacemaker-remote-ssl
|
||||
- impish-xena-pacemaker-remote-ssl
|
||||
- jammy-yoga
|
||||
|
||||
dev_bundles:
|
||||
# Rocky disabled until https://review.opendev.org/#/c/647756/ lands in
|
||||
# packaging
|
||||
- focal-yoga-pacemaker-remote-ssl
|
||||
- jammy-yoga-pacemaker-remote-ssl
|
||||
- jammy-yoga
|
||||
- jammy-zed
|
||||
- kinetic-zed
|
||||
|
||||
smoke_bundles:
|
||||
- focal-xena-pacemaker-remote-ssl
|
||||
- jammy-yoga
|
||||
|
||||
target_deploy_status:
|
||||
easyrsa:
|
||||
|
|
@ -45,5 +42,4 @@ target_deploy_status:
|
|||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- impish-xena-pacemaker-remote-ssl
|
||||
- jammy-yoga-pacemaker-remote-ssl
|
||||
- kinetic-zed
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
stestr>=2.2.0
|
||||
|
|
@ -13,25 +12,10 @@ stestr>=2.2.0
|
|||
# https://github.com/mtreinish/stestr/issues/145
|
||||
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
|
||||
charms.reactive
|
||||
|
||||
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
|
||||
# f'{something}'
|
||||
mock>=1.2,<4.0.0; python_version < '3.6'
|
||||
mock>=1.2; python_version >= '3.6'
|
||||
mock>=1.2
|
||||
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
|
|
|
|||
23
tox.ini
23
tox.ini
|
|
@ -31,10 +31,8 @@ minversion = 3.18.0
|
|||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
TERM=linux
|
||||
LAYER_PATH={toxinidir}/layers
|
||||
INTERFACE_PATH={toxinidir}/interfaces
|
||||
JUJU_REPOSITORY={toxinidir}/build
|
||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
|
||||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
allowlist_externals =
|
||||
|
|
@ -50,7 +48,7 @@ basepython = python3
|
|||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
charmcraft -v pack
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:build-reactive]
|
||||
|
|
@ -68,21 +66,6 @@ basepython = python3
|
|||
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: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]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
|
@ -91,7 +74,7 @@ commands = stestr run --slowest {posargs}
|
|||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = flake8==3.9.2
|
||||
charm-tools==2.8.3
|
||||
git+https://github.com/juju/charm-tools.git
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:func-target]
|
||||
|
|
|
|||
Loading…
Reference in New Issue