x
/
charm-ovn-central
Code Issues Proposed changes

Update to build using charmcraft 

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: I9b41911cdc3f8e6c327d68df50007b5223aaed34
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
This commit is contained in:
Alex Kavanagh 2022-01-27 15:59:35 +00:00 committed by Liam Young
parent 49e1297da5
commit 3d3fa8fa05
22 changed files with 121 additions and 338 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:
templates:
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: ovn-central
build_type: charmcraft

BIN
ovn-central.charm Normal file
View File

Binary file not shown.

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

@ -24,10 +24,7 @@ description: |
tags:
- networking
series:
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: false
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

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

@ -1,23 +0,0 @@
series: bionic
relations:
- - vault:shared-db
- mysql:shared-db
- - ovn-central:certificates
- vault:certificates
- - 'nrpe:nrpe-external-master'
- 'ovn-central: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:
series: bionic
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: cloud:bionic-train
nrpe:
charm: cs:nrpe

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

@ -1,23 +0,0 @@
series: bionic
relations:
- - vault:shared-db
- mysql:shared-db
- - ovn-central:certificates
- vault:certificates
- - 'nrpe:nrpe-external-master'
- 'ovn-central: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:
series: bionic
charm: cs:~openstack-charmers-next/ovn-central
num_units: 3
options:
source: cloud:bionic-ussuri/proposed
nrpe:
charm: cs:nrpe

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

@ -1,65 +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':
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
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
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'nrpe:nrpe-external-master'
- 'ovn-central:nrpe-external-master'

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

@ -1,64 +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':
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
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
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'nrpe:nrpe-external-master'
- 'ovn-central:nrpe-external-master'

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

@ -1,64 +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':
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
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
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'nrpe:nrpe-external-master'
- 'ovn-central:nrpe-external-master'

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

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
local_overlay_enabled: False
series: focal
comment:
@ -20,7 +22,7 @@ machines:
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,18 +30,21 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
charm: ../../../ovn-central.charm
num_units: 3
options:
source: *openstack-origin

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

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: False
series: focal
comment:
@ -20,7 +22,7 @@ machines:
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,18 +30,21 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
charm: ../../../ovn-central.charm
num_units: 3
options:
source: *openstack-origin

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

@ -1,64 +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':
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
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
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'nrpe:nrpe-external-master'
- 'ovn-central:nrpe-external-master'

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

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: impish
comment:
@ -20,7 +22,7 @@ machines:
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,18 +30,21 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
charm: ../../../ovn-central.charm
num_units: 3
options:
source: *openstack-origin

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

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: jammy
comment:
@ -20,7 +22,7 @@ machines:
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -28,18 +30,21 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
num_units: 1
to:
- '3'
channel: latest/edge
ovn-central:
charm: cs:~openstack-charmers-next/ovn-central
charm: ../../../ovn-central.charm
num_units: 3
options:
source: *openstack-origin

15
src/tests/tests.yaml
View File

@ -1,32 +1,26 @@
charm_name: ovn-central
gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- hirsute-wallaby
- impish-xena
smoke_bundles:
- focal-ussuri
- focal-xena
dev_bundles:
- bionic-train
- focal-yoga
- jammy-yoga
target_deploy_status:
ovn-central:
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"
vault:
workload-status: blocked
workload-status-message: Vault needs to be initialized
workload-status-message-prefix: Vault needs to be initialized
nrpe:
workload-status: blocked
workload-status-message: "Nagios server not configured or related"
workload-status-message-prefix: "Nagios server not configured or related"
# Note that full end to end tests are performed with OVN in the
# neutron-api-plugin-ovn and octavia charm gates
@ -39,6 +33,5 @@ tests:
tests_options:
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga

2
src/wheelhouse.txt
View File

@ -1,5 +1,7 @@
dnspython
psutil
poetry-core
six
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack

1
test-requirements.txt
View File

@ -51,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

25
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}
@ -86,6 +99,18 @@ 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