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: I56e04707036b994c52cc9cfcb19e6c37cd41309e
This commit is contained in:
Alex Kavanagh 2022-02-15 15:42:48 +00:00
parent 043c4fd795
commit d81d4bb128
13 changed files with 45 additions and 9 deletions

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ bin
.tox
tags
*.sw[nop]
*.charm
*.pyc
.idea
.unit-state.db

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

@ -18,11 +18,16 @@
voting: false
- vault-jammy-yoga-namespaced:
voting: false
vars:
needs_charm_build: true
charm_build_name: ceph-radosgw
build_type: charmcraft
- job:
name: vault-focal-xena_rgw
parent: func-target
dependencies:
- osci-lint
- charm-build
- tox-py38
- tox-py39
vars:

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

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

View File

@ -40,7 +40,7 @@ applications:
channel: latest/edge
ceph-radosgw:
charm: ceph-radosgw
charm: ../../ceph-radosgw.charm
num_units: 1
options:
source: *source

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