openstack/charm-cinder
Code Issues Proposed changes

Update to classic charms to build using charmcraft in CI

Browse Source 
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: Ic7cf54d7669219f4a42e08c8a1e2adb786a16af6
This commit is contained in:
Alex Kavanagh 2022-02-15 15:45:23 +00:00 committed by Corey Bryant
parent 7c551e4dfa
commit 8903fdca5e
10 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ bin
.testrepository
.tox
*.sw[nop]
*.charm
*.pyc
.unit-state.db
.stestr

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.

1
charmcraft.yaml
View File

@ -6,6 +6,7 @@ parts:
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*

4
osci.yaml
View File

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

17
tests/bundles/focal-xena.yaml
View File

@ -72,7 +72,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: yoga/edge
placement:
charm: ch:placement
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: yoga/edge
neutron-api:
charm: ch:neutron-api
@ -94,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -103,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -113,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: yoga/edge
glance:
charm: ch:glance
@ -122,11 +122,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: yoga/edge
nova-compute:
charm: ch:nova-compute
@ -144,9 +144,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: yoga/edge
cinder:
charm: ../../cinder.charm
num_units: 1
storage:
block-devices: '40G'

17
tests/bundles/focal-yoga.yaml
View File

@ -72,7 +72,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: yoga/edge
placement:
charm: ch:placement
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: yoga/edge
neutron-api:
charm: ch:neutron-api
@ -94,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -103,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -113,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: yoga/edge
glance:
charm: ch:glance
@ -122,11 +122,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: yoga/edge
nova-compute:
charm: ch:nova-compute
@ -144,9 +144,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: yoga/edge
cinder:
charm: ../../cinder.charm
num_units: 1
storage:
block-devices: '40G'

17
tests/bundles/impish-xena.yaml
View File

@ -72,7 +72,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: yoga/edge
placement:
charm: ch:placement
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: yoga/edge
neutron-api:
charm: ch:neutron-api
@ -94,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -103,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -113,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: yoga/edge
glance:
charm: ch:glance
@ -122,11 +122,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: yoga/edge
nova-compute:
charm: ch:nova-compute
@ -144,9 +144,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: yoga/edge
cinder:
charm: ../../cinder.charm
num_units: 1
storage:
block-devices: '40G'

17
tests/bundles/jammy-yoga.yaml
View File

@ -72,7 +72,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: yoga/edge
placement:
charm: ch:placement
@ -82,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: yoga/edge
neutron-api:
charm: ch:neutron-api
@ -94,7 +94,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: yoga/edge
keystone:
charm: ch:keystone
@ -103,7 +103,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -113,7 +113,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: yoga/edge
glance:
charm: ch:glance
@ -122,11 +122,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: yoga/edge
nova-compute:
charm: ch:nova-compute
@ -144,9 +144,10 @@ applications:
openstack-origin: *openstack-origin
to:
- '10'
channel: latest/edge
channel: yoga/edge
cinder:
charm: ../../cinder.charm
num_units: 1
storage:
block-devices: '40G'

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