openstack/charm-cinder-backup-swift-proxy
Code Issues Proposed changes

Updates for caracal testing support

Browse Source 
These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: Id665caf3df7b4db45f540526f36c94629b0bea26
This commit is contained in:
Alex Kavanagh
2024-02-09 18:15:47 +00:00
parent 3dd47bc24b
commit 4c9d28aee8
10 changed files with 73 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
charmcraft.yaml
View File

@@ -52,67 +52,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

2
osci.yaml
View File

@@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: cinder-backup-swift-proxy
build_type: charmcraft
charmcraft_channel: 2.x/edge
charmcraft_channel: 2.x/stable

6
src/metadata.yaml
View File

@@ -6,11 +6,9 @@ description: |
.
This subordinate charm configures the Cinder backup service.
tags:
- misc
- misc
series:
- jammy
- lunar
- mantic
- jammy
subordinate: true
provides:
backup-backend:

24
src/tests/bundles/jammy-antelope.yaml
View File

@@ -76,7 +76,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
cinder:
charm: ch:cinder
@@ -101,12 +101,12 @@ applications:
glance-api-version: 2
to:
- '12'
channel: latest/edge
channel: 2024.1/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
channel: 2024.1/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -170,7 +170,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
channel: 2024.1/edge
# external swift
swift-keystone-mysql-router:
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
swift-storage:
charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
relations:

24
src/tests/bundles/jammy-bobcat.yaml
View File

@@ -76,7 +76,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
cinder:
charm: ch:cinder
@@ -101,12 +101,12 @@ applications:
glance-api-version: 2
to:
- '12'
channel: latest/edge
channel: 2024.1/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
channel: 2024.1/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -170,7 +170,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
channel: 2024.1/edge
# external swift
swift-keystone-mysql-router:
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
swift-storage:
charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
relations:

30
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: False
series: mantic
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@@ -76,7 +76,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
cinder:
charm: ch:cinder
@@ -101,15 +101,15 @@ applications:
glance-api-version: 2
to:
- '12'
channel: latest/edge
channel: 2024.1/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
channel: 2024.1/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-23.10-amd64.charm
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
num_units: 0
options:
auth-version: 3
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -170,7 +170,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
channel: 2024.1/edge
# external swift
swift-keystone-mysql-router:
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
swift-storage:
charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
relations:

28
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@@ -76,7 +76,7 @@ applications:
- '6'
- '7'
- '8'
channel: latest/edge
channel: reef/edge
ceph-osd:
charm: ch:ceph-osd
@@ -90,7 +90,7 @@ applications:
- '9'
- '10'
- '11'
channel: latest/edge
channel: reef/edge
cinder:
charm: ch:cinder
@@ -101,15 +101,15 @@ applications:
glance-api-version: 2
to:
- '12'
channel: latest/edge
channel: 2024.1/edge
cinder-ceph:
charm: ch:cinder-ceph
num_units: 0
channel: latest/edge
channel: 2024.1/edge
cinder-backup-swift-proxy:
charm: ../../../cinder-backup-swift-proxy_ubuntu-23.04-amd64.charm
charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64.charm
num_units: 0
options:
auth-version: 3
@@ -126,7 +126,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '13'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@@ -135,7 +135,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '14'
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@@ -144,7 +144,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '15'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@@ -160,7 +160,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '17'
channel: latest/edge
channel: 2024.1/edge
placement:
charm: ch:placement
@@ -170,7 +170,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
channel: 2024.1/edge
# external swift
swift-keystone-mysql-router:
@@ -197,7 +197,7 @@ applications:
preferred-api-version: 3
to:
- '19'
channel: latest/edge
channel: 2024.1/edge
swift-proxy:
@@ -209,7 +209,7 @@ applications:
replicas: 1
to:
- '20'
channel: latest/edge
channel: 2024.1/edge
swift-storage:
charm: ch:swift-storage
@@ -221,7 +221,7 @@ applications:
block-devices: 'cinder,10G'
to:
- '21'
channel: latest/edge
channel: 2024.1/edge
relations:

11
src/tests/tests.yaml
View File

@@ -1,17 +1,16 @@
charm_name: cinder-backup-swift-proxy
gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-caracal
dev_bundles:
- noble-caracal
smoke_bundles:
- jammy-yoga
- jammy-caracal
configure:
- zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup
tests:
- zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal

4
src/tox.ini
View File

@@ -25,7 +25,9 @@ passenv =
CS_*
OS_*
TEST_*
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
basepython = python3

12
tox.ini
View File

@@ -59,12 +59,16 @@ commands =
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
@@ -77,7 +81,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3
deps = -r{toxinidir}/requirements.txt
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv =
{[testenv]setenv}