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: Ia8e4390dea57e7ce55950fb4296cf54ca7be7d7f
This commit is contained in:
Alex Kavanagh 2022-02-01 20:42:29 +00:00
parent 37312e904d
commit 3dfa5d6edd
13 changed files with 80 additions and 7 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ bin
tags
*.sw[nop]
*.pyc
*.charm
.unit-state.db
trusty/
xenial/

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.

View File

@ -2,9 +2,21 @@ type: charm
parts:
charm:
source: src/
plugin: reactive
build-snaps: [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

View File

@ -7,3 +7,4 @@
vars:
needs_charm_build: true
charm_build_name: neutron-api-plugin-arista
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

View File

@ -2,6 +2,8 @@ name: neutron-api-plugin-arista
summary: Arista ML2 plugin support for Neutron-API
maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
description: |
The Arista ML2 plugin suport for the neutron-api charm. This is a subordinate
charm.
tags:
- misc
- networking

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

View File

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
local_overlay_enabled: False
series: &series focal
applications:
@ -85,7 +87,7 @@ applications:
channel: latest/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
charm: ../../../neutron-api-plugin-arista.charm
num_units: 0
options:
source: *openstack-origin

View File

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: False
series: &series focal
applications:
@ -85,7 +87,7 @@ applications:
channel: latest/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
charm: ../../../neutron-api-plugin-arista.charm
num_units: 0
options:
source: *openstack-origin

View File

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series impish
applications:
@ -85,7 +87,7 @@ applications:
channel: latest/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
charm: ../../../neutron-api-plugin-arista.charm
num_units: 0
options:
source: *openstack-origin

View File

@ -1,6 +1,8 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: &series jammy
applications:
@ -85,7 +87,7 @@ applications:
channel: latest/edge
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
charm: ../../../neutron-api-plugin-arista.charm
num_units: 0
options:
source: *openstack-origin

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