x/charm-ovn-dedicated-chassis
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: I3199f7dba089767d27638ec3ca2b126a083fbe82
This commit is contained in:
Alex Kavanagh 2022-01-27 16:38:37 +00:00
parent 015414bfce
commit 81d7faefa8
20 changed files with 128 additions and 416 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

9
osci.yaml
View File

@ -1,11 +1,10 @@
- project: - project:
templates: templates:
- charm-yoga-unit-jobs - charm-unit-jobs-py38
- charm-yoga-functional-jobs - charm-unit-jobs-py39
- charm-xena-functional-jobs - charm-xena-functional-jobs
- charm-wallaby-functional-jobs - charm-yoga-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
vars: vars:
needs_charm_build: true needs_charm_build: true
charm_build_name: ovn-dedicated-chassis charm_build_name: ovn-dedicated-chassis
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

3
src/metadata.yaml
View File

@ -7,10 +7,7 @@ description: |
tags: tags:
- networking - networking
series: series:
- bionic
- focal - focal
- groovy
- hirsute
- impish - impish
subordinate: false subordinate: false
extra-bindings: extra-bindings:

3
src/test-requirements.txt
View File

@ -4,6 +4,9 @@
# https://github.com/openstack-charmers/release-tools # 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!) # 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.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

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

@ -1,31 +0,0 @@
series: bionic
relations:
- - vault:shared-db
- mysql:shared-db
- - ovn-central:certificates
- vault:certificates
- - ovn-dedicated-chassis:ovsdb
- ovn-central:ovsdb
- - ovn-dedicated-chassis:certificates
- vault:certificates
- - ovn-dedicated-chassis:nrpe-external-master
- nrpe:nrpe-external-master
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: cloud:bionic-train
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis
num_units: 2
options:
source: cloud:bionic-train
nrpe:
charm: cs:nrpe

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

@ -1,31 +0,0 @@
series: bionic
relations:
- - vault:shared-db
- mysql:shared-db
- - ovn-central:certificates
- vault:certificates
- - ovn-dedicated-chassis:ovsdb
- ovn-central:ovsdb
- - ovn-dedicated-chassis:certificates
- vault:certificates
- - ovn-dedicated-chassis:nrpe-external-master
- nrpe:nrpe-external-master
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: cloud:bionic-ussuri/proposed
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis
num_units: 2
options:
source: cloud:bionic-ussuri
nrpe:
charm: cs:nrpe

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

@ -1,78 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
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':
applications:
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '3'
nrpe:
charm: cs:nrpe
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis
num_units: 2
options:
source: *openstack-origin
to:
- '7'
- '8'
relations:
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-dedicated-chassis:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'

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

@ -1,78 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
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':
applications:
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '3'
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
nrpe:
charm: cs:nrpe
ovn-dedicated-chassis:
charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
num_units: 2
options:
source: *openstack-origin
to:
- '7'
- '8'
relations:
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-dedicated-chassis:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'

78
src/tests/bundles/focal-wallaby.yaml
View File

@ -1,78 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
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':
applications:
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '3'
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
nrpe:
charm: cs:nrpe
ovn-dedicated-chassis:
charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
num_units: 2
options:
source: *openstack-origin
to:
- '7'
- '8'
relations:
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-dedicated-chassis:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'

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

@ -1,6 +1,8 @@
variables: variables:
openstack-origin: &openstack-origin cloud:focal-xena openstack-origin: &openstack-origin cloud:focal-xena
local_overlay_enabled: False
series: focal series: focal
comment: comment:
@ -22,10 +24,11 @@ machines:
applications: applications:
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -33,15 +36,17 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: ch:vault
num_units: 1 num_units: 1
to: to:
- '3' - '3'
channel: latest/edge
ovn-central: ovn-central:
charm: cs:~openstack-charmers-next/ovn-central charm: ch:ovn-central
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -49,12 +54,13 @@ applications:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge
nrpe: nrpe:
charm: cs:nrpe charm: cs:nrpe
ovn-dedicated-chassis: ovn-dedicated-chassis:
charm: cs:~openstack-charmers-next/ovn-dedicated-chassis charm: ../../../ovn-dedicated-chassis.charm
num_units: 2 num_units: 2
options: options:
source: *openstack-origin source: *openstack-origin

16
src/tests/bundles/focal-yoga.yaml
View File

@ -1,6 +1,8 @@
variables: variables:
openstack-origin: &openstack-origin cloud:focal-yoga openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: False
series: focal series: focal
comment: comment:
@ -22,10 +24,11 @@ machines:
applications: applications:
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -33,15 +36,17 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: ch:vault
num_units: 1 num_units: 1
to: to:
- '3' - '3'
channel: latest/edge
ovn-central: ovn-central:
charm: cs:~openstack-charmers-next/ovn-central charm: ch:ovn-central
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -49,12 +54,13 @@ applications:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge
nrpe: nrpe:
charm: cs:nrpe charm: cs:nrpe
ovn-dedicated-chassis: ovn-dedicated-chassis:
charm: cs:~openstack-charmers-next/ovn-dedicated-chassis charm: ../../../ovn-dedicated-chassis.charm
num_units: 2 num_units: 2
options: options:
source: *openstack-origin source: *openstack-origin

79
src/tests/bundles/hirsute-wallaby.yaml
View File

@ -1,79 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
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':
applications:
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1
to:
- '3'
nrpe:
charm: cs:nrpe
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis
num_units: 2
options:
source: *openstack-origin
to:
- '7'
- '8'
relations:
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-dedicated-chassis:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:nrpe-external-master'
- 'nrpe:nrpe-external-master'

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

@ -1,6 +1,8 @@
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: impish series: impish
comment: comment:
@ -22,10 +24,11 @@ machines:
applications: applications:
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -33,18 +36,20 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: ch:vault
num_units: 1 num_units: 1
to: to:
- '3' - '3'
channel: latest/edge
nrpe: nrpe:
charm: cs:nrpe charm: cs:nrpe
ovn-central: ovn-central:
charm: cs:~openstack-charmers-next/ovn-central charm: ch:ovn-central
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -52,9 +57,10 @@ applications:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge
ovn-dedicated-chassis: ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis charm: ../../../ovn-dedicated-chassis.charm
num_units: 2 num_units: 2
options: options:
source: *openstack-origin source: *openstack-origin

16
src/tests/bundles/jammy-yoga.yaml
View File

@ -1,6 +1,8 @@
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: jammy series: jammy
comment: comment:
@ -22,10 +24,11 @@ machines:
applications: applications:
vault-mysql-router: vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: ch:mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -33,18 +36,20 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: latest/edge
vault: vault:
charm: cs:~openstack-charmers-next/vault charm: ch:vault
num_units: 1 num_units: 1
to: to:
- '3' - '3'
channel: latest/edge
nrpe: nrpe:
charm: cs:nrpe charm: cs:nrpe
ovn-central: ovn-central:
charm: cs:~openstack-charmers-next/ovn-central charm: ch:ovn-central
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
@ -52,9 +57,10 @@ applications:
- '4' - '4'
- '5' - '5'
- '6' - '6'
channel: latest/edge
ovn-dedicated-chassis: ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis charm: ../../../ovn-dedicated-chassis.charm
num_units: 2 num_units: 2
options: options:
source: *openstack-origin source: *openstack-origin

18
src/tests/tests.yaml
View File

@ -1,35 +1,29 @@
charm_name: ovn-dedicated-chassis charm_name: ovn-dedicated-chassis
gate_bundles: gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena - focal-xena
- hirsute-wallaby
- impish-xena - impish-xena
smoke_bundles: smoke_bundles:
- focal-ussuri - focal-xena
dev_bundles: dev_bundles:
- bionic-train
- focal-yoga - focal-yoga
- jammy-yoga - jammy-yoga
target_deploy_status: target_deploy_status:
ovn-central: ovn-central:
workload-status: waiting workload-status: waiting
workload-status-message: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data" workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data"
ovn-dedicated-chassis: ovn-dedicated-chassis:
workload-status: waiting workload-status: waiting
workload-status-message: "'certificates' awaiting server certificate data" workload-status-message-prefix: "'certificates' awaiting server certificate data"
vault: vault:
workload-status: blocked workload-status: blocked
workload-status-message: Vault needs to be initialized workload-status-message-prefix: Vault needs to be initialized
nrpe: nrpe:
workload-status: blocked workload-status: blocked
workload-status-message: "Nagios server not configured or related" workload-status-message-prefix: "Nagios server not configured or related"
configure: configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
@ -40,6 +34,4 @@ tests:
tests_options: tests_options:
force_deploy: force_deploy:
- hirsute-wallaby # workaround for lp:1933643
- impish-xena # because of nrpe charm not supporting hirsute
- jammy-yoga - jammy-yoga

1
test-requirements.txt
View File

@ -51,3 +51,4 @@ pbr==5.6.0 # vault
cryptography<3.4 # vault, keystone-saml-mellon cryptography<3.4 # vault, keystone-saml-mellon
lxml # keystone-saml-mellon lxml # keystone-saml-mellon
hvac # vault, barbican-vault hvac # vault, barbican-vault
psutil # cinder-lvm

25
tox.ini
View File

@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY passenv = 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 =
charmcraft
bash
tox
rename.sh
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
[testenv:build] [testenv:build]
basepython = python3 basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
{toxinidir}/rename.sh
[testenv:build-reactive]
basepython = python3
commands = commands =
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
@ -86,6 +99,18 @@ deps = flake8==3.9.2
charm-tools==2.8.3 charm-tools==2.8.3
commands = flake8 {posargs} src unit_tests 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] [testenv:cover]
# Technique based heavily upon # Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini