Updates to enable jammy and finalise charmcraft builds

- Add 22.04 to charmcraft.yaml
- Update metadata to include jammy
- Remove impish from metadata
- Update osci.yaml to include py3.10 default job
- Modify tox.ini to remove py35,py36,py37 tox target and add py310
  target.
- ensure that the openstack-origin is yoga
- pin wheelhouse.txt: setuptools < 50.0

Change-Id: Ife9e9c7368567febcd8b6bdd69b55f5c0ada3f3d
(cherry picked from commit acda89bb85)
This commit is contained in:
Alex Kavanagh 2022-03-25 16:21:02 +00:00 committed by Felipe Reyes
parent 86cc530e33
commit 938025c286
5 changed files with 20 additions and 16 deletions

1
.gitignore vendored
View File

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

View File

@ -19,7 +19,15 @@ parts:
cp -r $CHARMCRAFT_STAGE/* .
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -1,6 +1,6 @@
options:
openstack-origin:
default: distro
default: yoga
type: string
description: |
Repository from which to install. May be one of the following:

View File

@ -14,7 +14,7 @@ tags:
- baremetal
series:
- focal
- impish
- jammy
subordinate: false
requires:
shared-db:

15
tox.ini
View File

@ -68,21 +68,11 @@ 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
@ -93,6 +83,11 @@ 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