x
/
charm-ovn-dedicated-chassis
Code Issues Proposed changes

Add 2023.2 Bobcat support 

* sync charm-helpers to classic charms
* change openstack-origin/source default to bobcat
* 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/edge

Change-Id: I75d90bfc1e78a9c3f76f128e4f54846b01653917
This commit is contained in:
Corey Bryant 2023-07-18 16:47:19 -04:00
parent 4bcf39ae51
commit ed578d4dc2
8 changed files with 113 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
charmcraft.yaml
View File

@ -20,7 +20,6 @@ parts:
- CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
- CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
- MAKEFLAGS: -j$(nproc)
bases:
- build-on:
- name: ubuntu
@ -30,51 +29,91 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.10"
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- 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: "22.04"
architectures: [arm64]
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- name: ubuntu
channel: "23.04"
architectures: [arm64]
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
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: "22.04"
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.10"
architectures: [s390x]
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
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: ovn-dedicated-chassis
build_type: charmcraft
charmcraft_channel: 2.1/stable
charmcraft_channel: 2.x/edge

2
src/metadata.yaml
View File

@ -8,8 +8,8 @@ tags:
- networking
series:
- jammy
- kinetic
- lunar
- mantic
subordinate: false
extra-bindings:
data:

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

@ -22,7 +22,7 @@ applications:
channel: latest/edge
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64.charm
num_units: 2
options:
source: *openstack-origin

5
src/tests/bundles/jammy-zed.yaml → src/tests/bundles/jammy-bobcat.yaml
View File

@ -1,5 +1,5 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-zed
openstack-origin: &openstack-origin cloud:jammy-bobcat
local_overlay_enabled: False
@ -22,11 +22,12 @@ applications:
channel: latest/edge
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64.charm
num_units: 2
options:
source: *openstack-origin
relations:
- - 'ovn-central:certificates'

2
src/tests/bundles/lunar-antelope.yaml
View File

@ -22,7 +22,7 @@ applications:
channel: latest/edge
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
charm: ../../../ovn-dedicated-chassis_ubuntu-23.04-amd64.charm
num_units: 2
options:
source: *openstack-origin

38
src/tests/bundles/mantic-bobcat.yaml Normal file
View File

@ -0,0 +1,38 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: mantic
applications:
vault:
charm: ch:vault
num_units: 1
# The vault raft support is currently only available for jammy
series: jammy
channel: latest/edge
ovn-central:
charm: ch:ovn-central
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
ovn-dedicated-chassis:
charm: ../../../ovn-dedicated-chassis_ubuntu-23.10-amd64.charm
num_units: 2
options:
source: *openstack-origin
relations:
- - 'ovn-central:certificates'
- 'vault:certificates'
- - 'ovn-dedicated-chassis:ovsdb'
- 'ovn-central:ovsdb'
- - 'ovn-dedicated-chassis:certificates'
- 'vault:certificates'

9
src/tests/tests.yaml
View File

@ -1,15 +1,15 @@
charm_name: ovn-dedicated-chassis
gate_bundles:
- jammy-zed
- jammy-antelope
smoke_bundles:
- jammy-zed
- jammy-antelope
dev_bundles:
- jammy-zed
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
target_deploy_status:
ovn-central:
@ -32,3 +32,4 @@ tests:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat