openstack/charm-cinder-netapp
Code Issues Proposed changes

Update to build using charmcraft

Browse Source 
Due to a build problem with the reactive plugin, this change falls back
on overriding the steps and doing a manual build, but it also ensures
the CI system builds the charm using charmcraft.  Changes:

- add a build-requirements.txt
- modify charmcraft.yaml
- modify osci.yaml
    -> indicate build with charmcraft
- modify tox.ini
    -> tox -e build does charmcraft build/rename
    -> tox -e build-reactive does the reactive build
- modify bundles to use the <charm>.charm artifact in tests.
  and fix deprecation warning re: prefix
- tox inception to enable tox -e func-test in the CI

Change-Id: I976d4e043161d3ecdb6e7bc32cc3685f46efcaa6
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
This commit is contained in:
Alex Kavanagh 2022-01-27 13:09:30 +00:00 committed by Corey Bryant
parent f885450724
commit 944f24b239
23 changed files with 157 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-requirements.txt Normal file
View File

@ -0,0 +1,7 @@
# NOTES(lourot):
# * We don't install charmcraft via pip anymore because it anyway spins up a
# container and scp the system's charmcraft snap inside it. So the charmcraft
# snap is necessary on the system anyway.
# * `tox -e build` successfully validated with charmcraft 1.2.1
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.

25
charmcraft.yaml Normal file
View File

@ -0,0 +1,25 @@
type: charm
parts:
charm:
build-packages:
- tox
- git
- python3-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/* .
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

1
metadata.yaml Symbolic link
View File

@ -0,0 +1 @@
src/metadata.yaml

12
osci.yaml
View File

@ -1,13 +1,19 @@
- project:
templates:
- charm-unit-jobs
- charm-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
check:
jobs:
- focal-xena:
- focal-xena
- focal-yoga:
voting: false
- impish-xena:
voting: false
- jammy-yoga:
voting: false
vars:
needs_charm_build: true
charm_build_name: cinder-netapp
build_type: charmcraft

13
rename.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
echo "renaming ${charm}_*.charm to ${charm}.charm"
echo -n "pwd: "
pwd
ls -al
echo "Removing bad downloaded charm maybe?"
if [[ -e "${charm}.charm" ]];
then
rm "${charm}.charm"
fi
echo "Renaming charm here."
mv ${charm}_*.charm ${charm}.charm

0
src/files/.gitkeep Normal file
View File

3
src/metadata.yaml
View File

@ -11,10 +11,7 @@ tags:
- file-servers
- misc
series:
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: true
provides:

3
src/test-requirements.txt
View File

@ -4,6 +4,9 @@
# https://github.com/openstack-charmers/release-tools
#
# Need tox to be available from tox... inception yes, but its a workaround for now
tox
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

52
src/tests/bundles/bionic-queens.yaml
View File

@ -1,52 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
constraints: mem=4G root-disk=16G
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
to:
- '1'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

55
src/tests/bundles/bionic-rocky.yaml
View File

@ -1,55 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
constraints: mem=4G root-disk=16G
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-rocky
num_units: 1
to:
- '1'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

55
src/tests/bundles/bionic-stein.yaml
View File

@ -1,55 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
constraints: mem=4G root-disk=16G
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-stein
num_units: 1
to:
- '1'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: cloud:bionic-stein
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

56
src/tests/bundles/bionic-train.yaml
View File

@ -1,56 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
constraints: mem=4G root-disk=16G
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-train
num_units: 1
to:
- '1'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: cloud:bionic-train
block-device: None
overwrite: "true"
to:
- '2'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

57
src/tests/bundles/bionic-ussuri.yaml
View File

@ -1,57 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
constraints: mem=4G root-disk=16G
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-ussuri
num_units: 1
to:
- '1'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: cloud:bionic-ussuri
block-device: None
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

76
src/tests/bundles/focal-ussuri.yaml
View File

@ -1,76 +0,0 @@
series: focal
variables:
openstack-origin: &openstack-origin distro
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':
constraints: mem=4G root-disk=16G
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - cinder-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router

76
src/tests/bundles/focal-victoria.yaml
View File

@ -1,76 +0,0 @@
series: focal
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
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':
constraints: mem=4G root-disk=16G
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - cinder-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder:
charm: cs:~openstack-charmers-next/cinder
storage:
block-devices: '40G'
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router

22
src/tests/bundles/focal-xena.yaml
View File

@ -1,4 +1,6 @@
series: focal
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin cloud:focal-xena
comment:
@ -31,7 +33,7 @@ relations:
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -39,24 +41,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
storage:
block-devices: '40G'
num_units: 1
@ -66,11 +72,13 @@ applications:
overwrite: "true"
to:
- '5'
channel: latest/edge
cinder-netapp:
charm: cinder-netapp
charm: ../../../cinder-netapp.charm
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge

24
src/tests/bundles/focal-wallaby.yaml → src/tests/bundles/focal-yoga.yaml
View File

@ -1,6 +1,8 @@
series: focal
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
openstack-origin: &openstack-origin cloud:focal-yoga
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
@ -31,7 +33,7 @@ relations:
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -39,24 +41,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
storage:
block-devices: '40G'
num_units: 1
@ -66,11 +72,13 @@ applications:
overwrite: "true"
to:
- '5'
channel: latest/edge
cinder-netapp:
charm: cinder-netapp
charm: ../../../cinder-netapp.charm
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge

76
src/tests/bundles/groovy-victoria.yaml
View File

@ -1,76 +0,0 @@
series: groovy
variables:
openstack-origin: &openstack-origin distro
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':
constraints: mem=4G root-disk=16G
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - cinder-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder:
charm: cs:~openstack-charmers-next/cinder
storage:
block-devices: '40G'
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router

22
src/tests/bundles/impish-xena.yaml
View File

@ -1,4 +1,6 @@
series: impish
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
comment:
@ -31,7 +33,7 @@ relations:
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -39,24 +41,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
storage:
block-devices: '40G'
num_units: 1
@ -66,11 +72,13 @@ applications:
overwrite: "true"
to:
- '5'
channel: latest/edge
cinder-netapp:
charm: cinder-netapp
charm: ../../../cinder-netapp.charm
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge

24
src/tests/bundles/hirsute-wallaby.yaml → src/tests/bundles/jammy-yoga.yaml
View File

@ -1,4 +1,6 @@
series: hirsute
series: jammy
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
comment:
@ -31,7 +33,7 @@ relations:
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -39,24 +41,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
channel: latest/edge
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
storage:
block-devices: '40G'
num_units: 1
@ -66,11 +72,13 @@ applications:
overwrite: "true"
to:
- '5'
channel: latest/edge
cinder-netapp:
charm: cinder-netapp
charm: ../../../cinder-netapp.charm
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
volume-backend-name: NETAPP
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge

15
src/tests/tests.yaml
View File

@ -4,21 +4,14 @@ tests:
configure:
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
gate_bundles:
- bionic-queens
- bionic-rocky
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- groovy-victoria
- hirsute-wallaby
smoke_bundles:
- bionic-ussuri
- focal-xena
dev_bundles:
- focal-yoga
- impish-xena
- jammy-yoga
test_options:
force_deploy:
- impish-xena
- jammy-yoga

4
test-requirements.txt
View File

@ -3,9 +3,10 @@
# choices of *requirements.txt files for OpenStack Charms:
# 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
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
stestr>=2.2.0
# Dependency of stestr. Workaround for
@ -50,3 +51,4 @@ pbr==5.6.0 # vault
cryptography<3.4 # vault, keystone-saml-mellon
lxml # keystone-saml-mellon
hvac # vault, barbican-vault
psutil # cinder-lvm

30
tox.ini
View File

@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
install_command =
{toxinidir}/pip.sh install {opts} {packages}
allowlist_externals =
charmcraft
bash
tox
rename.sh
deps =
-r{toxinidir}/requirements.txt
[testenv:build]
basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
{toxinidir}/rename.sh
[testenv:build-reactive]
basepython = python3
commands =
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
@ -75,12 +88,29 @@ 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:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
commands = flake8 {posargs} src unit_tests
[testenv:func-target]
# Hack to get functional tests working in the charmcraft
# world. We should fix this.
basepython = python3
passenv = HOME TERM CS_* OS_* TEST_*
deps = -r{toxinidir}/src/test-requirements.txt
changedir = {toxinidir}/src
commands =
bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
tox --version
tox -e func-target {posargs}
[testenv:cover]
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini