Add charmcraft 3 support
Summary of changes: - Update the charmcraft.yaml file to use base and platforms, only allowing noble support. - Update config to default to caracal. - Update osci.yaml to use the charmcraft 3.x/beta - Drop non-noble tests - Update constraints file from -2024.1.txt to -noble.txt - Add charmbuild to .zuul.yaml Change-Id: I9c2427a8dcd4c06a2f1f41ecf5295b0605d4b04f
This commit is contained in:
@@ -2,3 +2,9 @@
|
|||||||
templates:
|
templates:
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
||||||
|
check:
|
||||||
|
jobs:
|
||||||
|
- charmbuild
|
||||||
|
vars:
|
||||||
|
charm_build_name: cinder-three-par
|
||||||
|
@@ -19,19 +19,17 @@ parts:
|
|||||||
apt install -y ca-certificates
|
apt install -y ca-certificates
|
||||||
update-ca-certificates
|
update-ca-certificates
|
||||||
|
|
||||||
bases:
|
base: ubuntu@24.04
|
||||||
- build-on:
|
platforms:
|
||||||
- name: ubuntu
|
amd64:
|
||||||
channel: "22.04"
|
build-on: amd64
|
||||||
architectures:
|
build-for: amd64
|
||||||
- amd64
|
arm64:
|
||||||
run-on:
|
build-on: arm64
|
||||||
- name: ubuntu
|
build-for: arm64
|
||||||
channel: "22.04"
|
ppc64el:
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
build-on: ppc64el
|
||||||
- name: ubuntu
|
build-for: ppc64el
|
||||||
channel: "23.04"
|
s390x:
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
build-on: s390x
|
||||||
- name: ubuntu
|
build-for: s390x
|
||||||
channel: "23.10"
|
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
|
||||||
|
@@ -6,4 +6,4 @@
|
|||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: cinder-three-par
|
charm_build_name: cinder-three-par
|
||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
charmcraft_channel: 2.x/stable
|
charmcraft_channel: 3.x/stable
|
||||||
|
@@ -1,35 +0,0 @@
|
|||||||
series: jammy
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:jammy-antelope
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
local_overlay_enabled: false
|
|
||||||
relations:
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-three-par:storage-backend
|
|
||||||
applications:
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
block-device: None
|
|
||||||
overwrite: "true"
|
|
||||||
ephemeral-unmount: /mnt
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
cinder-three-par:
|
|
||||||
charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm
|
|
||||||
options:
|
|
||||||
hpe3par-debug: False
|
|
||||||
driver-type: fc
|
|
||||||
san-ip: 127.0.0.1
|
|
||||||
san-login: admin
|
|
||||||
san-password: password
|
|
||||||
hpe3par-username: admin
|
|
||||||
hpe3par-password: password
|
|
||||||
hpe3par-api-url: https://127.0.0.1:8080/api/v1/
|
|
||||||
hpe3par-cpg: cpgname
|
|
||||||
hpe3par_cpg_snap: cpgname
|
|
||||||
use-multipath-for-image-xfer: True
|
|
||||||
enforce-multipath-for-image-xfer: True
|
|
@@ -1,35 +0,0 @@
|
|||||||
series: jammy
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:jammy-bobcat
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
local_overlay_enabled: false
|
|
||||||
relations:
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-three-par:storage-backend
|
|
||||||
applications:
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
block-device: None
|
|
||||||
overwrite: "true"
|
|
||||||
ephemeral-unmount: /mnt
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
cinder-three-par:
|
|
||||||
charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm
|
|
||||||
options:
|
|
||||||
hpe3par-debug: False
|
|
||||||
driver-type: fc
|
|
||||||
san-ip: 127.0.0.1
|
|
||||||
san-login: admin
|
|
||||||
san-password: password
|
|
||||||
hpe3par-username: admin
|
|
||||||
hpe3par-password: password
|
|
||||||
hpe3par-api-url: https://127.0.0.1:8080/api/v1/
|
|
||||||
hpe3par-cpg: cpgname
|
|
||||||
hpe3par_cpg_snap: cpgname
|
|
||||||
use-multipath-for-image-xfer: True
|
|
||||||
enforce-multipath-for-image-xfer: True
|
|
@@ -1,35 +0,0 @@
|
|||||||
series: mantic
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
local_overlay_enabled: false
|
|
||||||
relations:
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-three-par:storage-backend
|
|
||||||
applications:
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
block-device: None
|
|
||||||
overwrite: "true"
|
|
||||||
ephemeral-unmount: /mnt
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
cinder-three-par:
|
|
||||||
charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm
|
|
||||||
options:
|
|
||||||
hpe3par-debug: False
|
|
||||||
driver-type: fc
|
|
||||||
san-ip: 127.0.0.1
|
|
||||||
san-login: admin
|
|
||||||
san-password: password
|
|
||||||
hpe3par-username: admin
|
|
||||||
hpe3par-password: password
|
|
||||||
hpe3par-api-url: https://127.0.0.1:8080/api/v1/
|
|
||||||
hpe3par-cpg: cpgname
|
|
||||||
hpe3par_cpg_snap: cpgname
|
|
||||||
use-multipath-for-image-xfer: True
|
|
||||||
enforce-multipath-for-image-xfer: True
|
|
@@ -1,6 +1,6 @@
|
|||||||
series: lunar
|
series: caracal
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin cloud:noble-caracal
|
||||||
machines:
|
machines:
|
||||||
'0':
|
'0':
|
||||||
local_overlay_enabled: false
|
local_overlay_enabled: false
|
||||||
@@ -19,7 +19,7 @@ applications:
|
|||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
cinder-three-par:
|
cinder-three-par:
|
||||||
charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm
|
charm: ../../../cinder-three-par.charm
|
||||||
options:
|
options:
|
||||||
hpe3par-debug: False
|
hpe3par-debug: False
|
||||||
driver-type: fc
|
driver-type: fc
|
@@ -1,15 +1,13 @@
|
|||||||
charm_name: cinder-three-par
|
charm_name: cinder-three-par
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-antelope
|
- noble-caracal
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-antelope
|
- noble-caracal
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-bobcat
|
- noble-caracal
|
||||||
- lunar-antelope
|
|
||||||
- mantic-bobcat
|
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
cinder:
|
cinder:
|
||||||
@@ -23,5 +21,4 @@ tests:
|
|||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- lunar-antelope
|
- noble-carcal
|
||||||
- mantic-bobcat
|
|
||||||
|
7
tox.ini
7
tox.ini
@@ -69,9 +69,14 @@ basepython = python3.10
|
|||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py312]
|
||||||
|
basepython = python3.12
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==7.1.1
|
||||||
git+https://github.com/juju/charm-tools.git
|
git+https://github.com/juju/charm-tools.git
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user