Updates to enable jammy and finalise charmcraft builds

- Add 22.04 to charmcraft.yaml
- Update metadata to include jammy
- Remove impish from metadata
- ensure that the source is yoga

Change-Id: Ibb93704c6d66f522cf112ad115b3a294d7a1eb03
This commit is contained in:
Chris MacNaughton 2022-03-29 11:44:05 +02:00
parent 99ef6cb306
commit 88ecd7f6ec
6 changed files with 30 additions and 20 deletions

View File

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

View File

@ -21,7 +21,23 @@ parts:
- README.md - README.md
bases: bases:
- name: ubuntu - build-on:
channel: "20.04" - name: ubuntu
architectures: channel: "20.04"
- amd64 architectures:
- amd64
- s390x
- ppc64el
- arm64
- name: ubuntu
channel: "22.04"
architectures:
- amd64
- s390x
- ppc64el
- arm64
run-on:
- name: ubuntu
channel: "20.04"
- name: ubuntu
channel: "22.04"

View File

@ -5,7 +5,7 @@ options:
description: OSD debug level. Max is 20. description: OSD debug level. Max is 20.
source: source:
type: string type: string
default: default: yoga
description: | description: |
Optional configuration to support use of additional sources such as: Optional configuration to support use of additional sources such as:
. .

View File

@ -12,7 +12,7 @@ tags:
- misc - misc
series: series:
- focal - focal
- impish - jammy
description: | description: |
Ceph is a distributed storage and network file system designed to provide Ceph is a distributed storage and network file system designed to provide
excellent performance, reliability, and scalability. excellent performance, reliability, and scalability.

View File

@ -1,10 +1,9 @@
- project: - project:
templates: templates:
- charm-unit-jobs-py38 - charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs - charm-xena-functional-jobs
- charm-yoga-functional-jobs - charm-yoga-functional-jobs
vars: vars:
needs_charm_build: true needs_charm_build: true
charm_build_name: ceph-osd charm_build_name: ceph-osd
build_type: charmcraft build_type: charmcraft

15
tox.ini
View File

@ -51,21 +51,11 @@ commands =
charmcraft -v build charmcraft -v build
{toxinidir}/rename.sh {toxinidir}/rename.sh
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py36] [testenv:py36]
basepython = python3.6 basepython = python3.6
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:py37]
basepython = python3.7
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py38] [testenv:py38]
basepython = python3.8 basepython = python3.8
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
@ -76,6 +66,11 @@ basepython = python3.9
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt