Add 2023.2 Bobcat support
* sync charm-helpers to classic charms * change openstack-origin/source default to quincy * add mantic to metadata series * align testing with bobcat * add new bobcat bundles * add bobcat bundles to tests.yaml * add bobcat tests to osci.yaml * update build-on and run-on bases * drop kinetic * update charmcraft_channel to 2.x/stable Change-Id: Ibb97b427f29a061adc2d67e55ae3976387d332c7
This commit is contained in:
parent
f7764412a3
commit
3c9e6f10ba
|
@ -33,9 +33,9 @@ bases:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
- name: ubuntu
|
|
||||||
channel: "22.10"
|
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "23.04"
|
channel: "23.04"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.10"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
|
|
@ -4,10 +4,9 @@
|
||||||
- charm-unit-jobs-py39
|
- charm-unit-jobs-py39
|
||||||
- charm-xena-functional-jobs
|
- charm-xena-functional-jobs
|
||||||
- charm-yoga-functional-jobs
|
- charm-yoga-functional-jobs
|
||||||
- charm-zed-functional-jobs
|
|
||||||
- charm-functional-jobs
|
- charm-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: ceph-fs
|
charm_build_name: ceph-fs
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
charmcraft_channel: 2.0/stable
|
charmcraft_channel: 2.x/stable
|
||||||
|
|
|
@ -8,16 +8,13 @@
|
||||||
# requirements.txt
|
# requirements.txt
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# NOTE: newer versions of cryptography require a Rust compiler to build,
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
# see
|
||||||
charm-tools==2.8.4
|
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||||
|
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
|
||||||
|
#
|
||||||
|
cryptography<3.4
|
||||||
|
|
||||||
|
git+https://github.com/juju/charm-tools.git
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
|
||||||
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
|
|
||||||
# "ModuleNotFoundError")
|
|
||||||
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
|
|
||||||
# some tox targets use only test-requirements.txt whereas charm-build uses only
|
|
||||||
# requirements.txt
|
|
||||||
importlib-metadata<3.0.0; python_version < '3.6'
|
|
||||||
importlib-resources<3.0.0; python_version < '3.6'
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ options:
|
||||||
description: Mon and OSD debug level. Max is 20.
|
description: Mon and OSD debug level. Max is 20.
|
||||||
source:
|
source:
|
||||||
type: string
|
type: string
|
||||||
default: yoga
|
default: quincy
|
||||||
description: |
|
description: |
|
||||||
Optional configuration to support use of additional sources such as:
|
Optional configuration to support use of additional sources such as:
|
||||||
.
|
.
|
||||||
|
|
|
@ -12,8 +12,8 @@ tags:
|
||||||
series:
|
series:
|
||||||
- focal
|
- focal
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
|
||||||
- lunar
|
- lunar
|
||||||
|
- mantic
|
||||||
subordinate: false
|
subordinate: false
|
||||||
requires:
|
requires:
|
||||||
ceph-mds:
|
ceph-mds:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:jammy-zed
|
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
|
@ -3,7 +3,7 @@ variables:
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: &series kinetic
|
series: &series mantic
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
ubuntu: # used to test mounts
|
ubuntu: # used to test mounts
|
|
@ -3,6 +3,8 @@ gate_bundles:
|
||||||
- focal-xena
|
- focal-xena
|
||||||
- focal-yoga
|
- focal-yoga
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
|
- jammy-bobcat
|
||||||
|
- mantic-bobcat
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-xena
|
- focal-xena
|
||||||
# configure:
|
# configure:
|
||||||
|
@ -19,4 +21,4 @@ tests:
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
ubuntu:
|
ubuntu:
|
||||||
workload-status: active
|
workload-status: active
|
||||||
workload-status-message-prefix: ''
|
workload-status-message-prefix: ''
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -97,7 +97,6 @@ commands = stestr run --slowest {posargs}
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
charm-tools==2.8.4
|
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
[testenv:func-target]
|
[testenv:func-target]
|
||||||
|
|
Loading…
Reference in New Issue