Migrate charm charmhub for stable/wallaby

- start from stable/wallaby branch
- Do charmcraft, osci, zuul changes
- Modify libs to point to stable/wallaby for:
  - charmhelpers
  - charms.openstack (as needed)
  - zaza & zaza.openstack.tests
- Remove unsupported test bundles
- migration bundles to charmhub.io (ch: prefix + channels)
- Build on 20.04 amd64
- Run on 20.04 amd64, s390x, ppc64el, arm64

Change-Id: Id8adeddf95fbf39ccf265026016c3281c78ade5c
This commit is contained in:
Alex Kavanagh 2022-05-17 19:16:11 +01:00
parent c6e4753573
commit 0b21dbaf7d
19 changed files with 212 additions and 360 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ xenial/
.stestr
__pycache__
func-results.json
*.charm

View File

@ -3,4 +3,4 @@ host=review.opendev.org
port=29418
project=openstack/charm-magnum.git
defaultbranch=stable/21.10
defaultbranch=stable/wallaby

View File

@ -1,4 +1,4 @@
- project:
templates:
- openstack-python3-charm-jobs
- openstack-python3-wallaby-jobs
- openstack-cover-jobs

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.

30
charmcraft.yaml Normal file
View File

@ -0,0 +1,30 @@
type: charm
parts:
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:
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]

1
metadata.yaml Symbolic link
View File

@ -0,0 +1 @@
src/metadata.yaml

9
osci.yaml Normal file
View File

@ -0,0 +1,9 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-victoria-functional-jobs
- charm-wallaby-functional-jobs
vars:
needs_charm_build: true
charm_build_name: magnum
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

@ -9,6 +9,7 @@
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# Build requirements
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
charm-tools==2.8.3

View File

@ -164,17 +164,11 @@
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.10",
"branch": "stable/wallaby",
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
"vcs": "git"
},
@ -194,8 +188,8 @@
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.10",
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
"branch": "stable/wallaby",
"version": "f8f822d5e908b1ac5694815c2d5522b6533e04f8",
"vcs": "git"
},
{

View File

@ -10,11 +10,7 @@ description: |
tags:
- openstack
series:
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: false
requires:
shared-db:

View File

@ -5,5 +5,9 @@
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
# Need tox to be available from tox... inception yes, but its a workaround for now
tox

View File

@ -1,279 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-ussuri
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
'5':
'6':
'7':
# the following machines are for nova-compute which needs more memory
# for the instances.
'8':
constraints: mem=4096M cores=4
'9':
constraints: mem=4096M cores=4
'10':
'11':
'12':
'13':
'14':
'15':
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
source: *openstack-origin
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
to:
- '2'
neutron-api:
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '5'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 2
storage:
ephemeral-device: '40G'
options:
openstack-origin: *openstack-origin
to:
- '8'
- '9'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '10'
magnum:
charm: ../../../magnum
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '11'
- '12'
- '13'
magnum-hacluster:
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
heat:
charm: cs:~openstack-charmers/heat
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
barbican:
charm: cs:~openstack-charmers/barbican
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
relations:
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:neutron-api'
- 'nova-cloud-controller:neutron-api'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'rabbitmq-server:amqp'
- 'neutron-openvswitch:amqp'
- - 'placement:shared-db'
- 'percona-cluster:shared-db'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'vault:shared-db'
- 'percona-cluster:shared-db'
- - 'vault:certificates'
- 'neutron-api:certificates'
- - 'vault:certificates'
- 'glance:certificates'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:certificates'
- 'nova-cloud-controller:certificates'
- - 'vault:certificates'
- 'placement:certificates'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'magnum:certificates'
- 'vault:certificates'
- - 'magnum:ha'
- 'magnum-hacluster:ha'
- - 'heat:amqp'
- 'rabbitmq-server:amqp'
- - 'heat:identity-service'
- 'keystone:identity-service'
- - 'heat:shared-db'
- 'percona-cluster:shared-db'
- - 'heat:certificates'
- 'vault:certificates'
- - 'barbican:amqp'
- 'rabbitmq-server:amqp'
- - 'barbican:identity-service'
- 'keystone:identity-service'
- - 'barbican:shared-db'
- 'percona-cluster:shared-db'
- - 'barbican:certificates'
- 'vault:certificates'

View File

@ -1,3 +1,5 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
@ -35,26 +37,35 @@ machines:
applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
neutron-api-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
magnum-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
heat-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
barbican-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -62,24 +73,27 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0/edge
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.8/edge
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
to:
- '4'
channel: wallaby/edge
neutron-api:
charm: cs:~openstack-charmers/neutron-api
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -89,45 +103,51 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: wallaby/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: wallaby/edge
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: wallaby/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '8'
channel: wallaby/edge
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: wallaby/edge
placement:
charm: cs:~openstack-charmers/placement
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '9'
channel: wallaby/edge
nova-compute:
charm: cs:~openstack-charmers/nova-compute
charm: ch:nova-compute
num_units: 2
storage:
ephemeral-device: '40G'
@ -136,15 +156,17 @@ applications:
to:
- '10'
- '11'
channel: wallaby/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '12'
channel: 1.7/edge
magnum:
charm: ../../../magnum
charm: ../../../magnum.charm
num_units: 3
options:
openstack-origin: *openstack-origin
@ -154,27 +176,30 @@ applications:
- '15'
magnum-hacluster:
charm: cs:~openstack-charmers/hacluster
charm: ch:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
channel: 2.0.3/edge
heat:
charm: cs:~openstack-charmers/heat
charm: ch:heat
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: wallaby/edge
barbican:
charm: cs:~openstack-charmers/barbican
charm: ch:barbican
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: wallaby/edge
relations:

View File

@ -1,5 +1,7 @@
local_overlay_enabled: False
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:focal-wallaby
series: focal
@ -35,26 +37,35 @@ machines:
applications:
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
neutron-api-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
magnum-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
heat-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
barbican-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -62,24 +73,27 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0/edge
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: 3.8/edge
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
charm: ch:nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
to:
- '4'
channel: wallaby/edge
neutron-api:
charm: cs:~openstack-charmers/neutron-api
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -89,45 +103,51 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: wallaby/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: wallaby/edge
neutron-gateway:
charm: cs:~openstack-charmers/neutron-gateway
charm: ch:neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: wallaby/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '8'
channel: wallaby/edge
neutron-openvswitch:
charm: cs:~openstack-charmers/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: wallaby/edge
placement:
charm: cs:~openstack-charmers/placement
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '9'
channel: wallaby/edge
nova-compute:
charm: cs:~openstack-charmers/nova-compute
charm: ch:nova-compute
num_units: 2
storage:
ephemeral-device: '40G'
@ -136,15 +156,17 @@ applications:
to:
- '10'
- '11'
channel: wallaby/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '12'
channel: 1.7/edge
magnum:
charm: ../../../magnum
charm: ../../../magnum.charm
num_units: 3
options:
openstack-origin: *openstack-origin
@ -154,27 +176,30 @@ applications:
- '15'
magnum-hacluster:
charm: cs:~openstack-charmers/hacluster
charm: ch:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
channel: 2.0.3/edge
heat:
charm: cs:~openstack-charmers/heat
charm: ch:heat
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: wallaby/edge
barbican:
charm: cs:~openstack-charmers/barbican
charm: ch:barbican
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: wallaby/edge
relations:

View File

@ -4,9 +4,8 @@ smoke_bundles:
- focal-victoria
gate_bundles:
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize

View File

@ -1,3 +1,3 @@
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
git+https://github.com/juju/charm-helpers@stable/wallaby#egg=charmhelpers

View File

@ -3,6 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
@ -34,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#

45
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}
@ -55,32 +68,44 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py37]
basepython = python3.7
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py38]
basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
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