Update to classic charms to build using charmcraft in CI

This update is to ensure that the Zuul Canonical CI builds the charm
before functional tests and ensure that that artifact is used for the
functional tests.  This is to try to ensure that the charm that gets
landed to the charmhub is the same charm that was tested with.

Change-Id: I3cb1f519e8f1d6765b41751994633be73e5bdea5
This commit is contained in:
Alex Kavanagh 2022-02-15 17:06:47 +00:00
parent c01df1bc35
commit b0b51cc6ea
9 changed files with 40 additions and 6 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ revision
.testrepository
*.sw[nop]
*.pyc
*.charm
__pycache__/
.project
.pydevproject

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

@ -4,4 +4,7 @@
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: rabbitmq-server
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

@ -42,7 +42,7 @@ applications:
channel: latest/edge
rabbitmq-server:
charm: "../../../rabbitmq-server"
charm: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2

View File

@ -42,7 +42,7 @@ applications:
channel: latest/edge
rabbitmq-server:
charm: "../../../rabbitmq-server"
charm: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2

View File

@ -42,7 +42,7 @@ applications:
channel: latest/edge
rabbitmq-server:
charm: "../../../rabbitmq-server"
charm: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2

View File

@ -42,7 +42,7 @@ applications:
channel: latest/edge
rabbitmq-server:
charm: "../../../rabbitmq-server"
charm: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2

12
tox.ini
View File

@ -37,10 +37,20 @@ setenv = VIRTUAL_ENV={envdir}
install_command =
{toxinidir}/pip.sh install {opts} {packages}
commands = stestr run --slowest {posargs}
allowlist_externals = juju
allowlist_externals =
charmcraft
rename.sh
passenv = HOME TERM CS_* OS_* TEST_*
deps = -r{toxinidir}/test-requirements.txt
[testenv:build]
basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
{toxinidir}/rename.sh
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt