openstack
/
charm-barbican
Code Issues Proposed changes

Updates for caracal testing support 

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: I4f5df7cd306e69210b53e2c800de609337e8c84f
This commit is contained in:
Alex Kavanagh 2024-02-08 10:43:09 +00:00
parent fd3e818c2c
commit 6cf0e77016
7 changed files with 25 additions and 95 deletions
Show Stats 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]

6
src/metadata.yaml
View File

@ -6,11 +6,9 @@ description: |
management of secrets such as passwords and encryption keys. It is aimed at
being useful for all environments, including large ephemeral Clouds
tags:
- openstack
- openstack
series:
- jammy
- lunar
- mantic
- jammy
subordinate: false
requires:
shared-db:

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

@ -20,10 +20,10 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -34,7 +34,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -43,7 +43,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
barbican:
series: *series
@ -60,7 +60,7 @@ applications:
num_units: 1
to:
- '5'
channel: latest/edge
channel: 3.9/edge
relations:

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

@ -20,10 +20,10 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -34,7 +34,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -43,7 +43,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
barbican:
series: *series
@ -60,7 +60,7 @@ applications:
num_units: 1
to:
- '5'
channel: latest/edge
channel: 3.9/edge
relations:

16
src/tests/bundles/lunar-antelope.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: &series lunar
series: &series jammy
machines:
'0':
@ -20,10 +20,10 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -34,7 +34,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -43,11 +43,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
barbican:
series: *series
charm: ../../../barbican_ubuntu-23.04-amd64.charm
charm: ../../../barbican_ubuntu-22.04-amd64.charm
num_units: 1
options:
openstack-origin: *openstack-origin
@ -60,7 +60,7 @@ applications:
num_units: 1
to:
- '5'
channel: latest/edge
channel: 3.9/edge
relations:

10
src/tests/bundles/mantic-bobcat.yaml
View File

@ -20,10 +20,10 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -34,7 +34,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -43,7 +43,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
barbican:
series: *series
@ -60,7 +60,7 @@ applications:
num_units: 1
to:
- '5'
channel: latest/edge
channel: 3.9/edge
relations:

4
src/tests/tests.yaml
View File

@ -5,11 +5,7 @@ gate_bundles:
- jammy-antelope
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
tests:
- zaza.openstack.charm_tests.barbican.tests.BarbicanTest
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat