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 Change-Id: I166d5b7399f2b6746768707388824a25f68d11cf
This commit is contained in:
parent
1399f22e66
commit
4a7d0fe2e9
|
@ -19,7 +19,23 @@ parts:
|
|||
cp -r $CHARMCRAFT_STAGE/* .
|
||||
|
||||
bases:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures:
|
||||
- amd64
|
||||
- build-on:
|
||||
- name: focal
|
||||
channel: "20.04"
|
||||
architectures:
|
||||
- amd64
|
||||
- s390x
|
||||
- ppc64el
|
||||
- arm64
|
||||
- name: jammy
|
||||
channel: "22.04"
|
||||
architectures:
|
||||
- amd64
|
||||
- s390x
|
||||
- ppc64el
|
||||
- arm64
|
||||
run-on:
|
||||
- name: focal
|
||||
channel: "20.04"
|
||||
- name: jammy
|
||||
channel: "22.04"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs-py38
|
||||
- charm-unit-jobs-py39
|
||||
- charm-unit-jobs-py310
|
||||
- charm-xena-functional-jobs
|
||||
- charm-yoga-functional-jobs
|
||||
vars:
|
||||
|
|
|
@ -21,7 +21,7 @@ tags:
|
|||
- idP
|
||||
series:
|
||||
- focal
|
||||
- impish
|
||||
- jammy
|
||||
provides:
|
||||
keystone-fid-service-provider:
|
||||
interface: keystone-fid-service-provider
|
||||
|
|
19
tox.ini
19
tox.ini
|
@ -68,28 +68,13 @@ 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
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
|
|
Loading…
Reference in New Issue