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: I3559219e8d723dcf23fe107e7585b6f005053224
This commit is contained in:
Alex Kavanagh
Corey Bryant
parent
fc2fd1b649
commit
26e45baa26
|
|
@ -6,6 +6,7 @@ bin
|
|||
tags
|
||||
*.sw[nop]
|
||||
*.pyc
|
||||
*.charm
|
||||
tests/cirros-*
|
||||
func-results.json
|
||||
.settings
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -6,6 +6,7 @@ parts:
|
|||
source: .
|
||||
prime:
|
||||
- actions/*
|
||||
- charmhelpers/*
|
||||
- files/*
|
||||
- hooks/*
|
||||
- lib/*
|
||||
|
|
|
|||
|
|
@ -4,3 +4,7 @@
|
|||
- charm-unit-jobs-py39
|
||||
- charm-yoga-functional-jobs
|
||||
- charm-xena-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: swift-storage
|
||||
build_type: charmcraft
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -13,11 +13,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
|
|||
|
||||
requests>=2.18.4
|
||||
|
||||
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
|
||||
# f'{something}'
|
||||
mock>=1.2,<4.0.0; python_version < '3.6'
|
||||
mock>=1.2; python_version >= '3.6'
|
||||
|
||||
stestr>=2.2.0
|
||||
|
||||
# Dependency of stestr. Workaround for
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ch:swift-proxy
|
||||
|
|
@ -57,7 +57,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
glance:
|
||||
expose: True
|
||||
|
|
@ -67,10 +67,10 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
charm: ../../swift-storage.charm
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ch:swift-proxy
|
||||
|
|
@ -57,7 +57,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
glance:
|
||||
expose: True
|
||||
|
|
@ -67,10 +67,10 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
charm: ../../swift-storage.charm
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ch:swift-proxy
|
||||
|
|
@ -57,7 +57,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
glance:
|
||||
expose: True
|
||||
|
|
@ -67,10 +67,10 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
charm: ../../swift-storage.charm
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ch:swift-proxy
|
||||
|
|
@ -57,7 +57,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
glance:
|
||||
expose: True
|
||||
|
|
@ -67,10 +67,10 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
|
||||
swift-storage:
|
||||
charm: swift-storage
|
||||
charm: ../../swift-storage.charm
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
applications:
|
||||
keystone:
|
||||
offers:
|
||||
keystone:
|
||||
endpoints:
|
||||
- identity-service
|
||||
swift-proxy-region1:
|
||||
offers:
|
||||
swift-proxy-region1:
|
||||
endpoints:
|
||||
- swift-storage
|
||||
- rings-distributor
|
||||
swift-storage-region1-zone1:
|
||||
charm: {{ charm_location }}
|
||||
offers:
|
||||
swift-storage-region1-zone1:
|
||||
endpoints:
|
||||
- swift-storage
|
||||
swift-storage-region1-zone2:
|
||||
charm: {{ charm_location }}
|
||||
offers:
|
||||
swift-storage-region1-zone2:
|
||||
endpoints:
|
||||
- swift-storage
|
||||
swift-storage-region1-zone3:
|
||||
charm: {{ charm_location }}
|
||||
offers:
|
||||
swift-storage-region1-zone3:
|
||||
endpoints:
|
||||
- swift-storage
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
applications:
|
||||
swift-storage-region2-zone1:
|
||||
charm: {{ charm_location }}
|
||||
swift-storage-region2-zone2:
|
||||
charm: {{ charm_location }}
|
||||
swift-storage-region2-zone3:
|
||||
charm: {{ charm_location }}
|
||||
relations:
|
||||
- - swift-proxy-region2:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-proxy-region2:swift-storage
|
||||
- swift-storage-region1-zone1:swift-storage
|
||||
- - swift-proxy-region2:swift-storage
|
||||
- swift-storage-region1-zone2:swift-storage
|
||||
- - swift-proxy-region2:swift-storage
|
||||
- swift-storage-region1-zone3:swift-storage
|
||||
- - swift-storage-region2-zone1:swift-storage
|
||||
- swift-proxy-region1:swift-storage
|
||||
- - swift-storage-region2-zone2:swift-storage
|
||||
- swift-proxy-region1:swift-storage
|
||||
- - swift-storage-region2-zone3:swift-storage
|
||||
- swift-proxy-region1:swift-storage
|
||||
- - swift-proxy-region2:rings-consumer
|
||||
- swift-proxy-region1:rings-distributor
|
||||
saas:
|
||||
keystone:
|
||||
url: admin/{{ swift_gr_region1 }}.keystone
|
||||
swift-proxy-region1:
|
||||
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
|
||||
swift-storage-region1-zone1:
|
||||
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
|
||||
swift-storage-region1-zone2:
|
||||
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
|
||||
swift-storage-region1-zone3:
|
||||
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3
|
||||
12
tox.ini
12
tox.ini
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue