From bb08c78cb1b81332307f5febd41e7eec00bbabf4 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 18 Jul 2023 16:47:19 -0400 Subject: [PATCH] Add mantic support Change-Id: I1099f1a47a2f2f59732ba52699070bdba24eebc1 --- charmcraft.yaml | 32 +++++++++++++++++++ osci.yaml | 20 ++++++------ src/metadata.yaml | 1 + ...kinetic-mysql8.yaml => mantic-mysql8.yaml} | 4 +-- ...-cluster.yaml => mantic-raft-cluster.yaml} | 4 +-- .../{kinetic-raft.yaml => mantic-raft.yaml} | 4 +-- src/tests/tests.yaml | 12 +++---- 7 files changed, 55 insertions(+), 22 deletions(-) rename src/tests/bundles/{kinetic-mysql8.yaml => mantic-mysql8.yaml} (96%) rename src/tests/bundles/{kinetic-raft-cluster.yaml => mantic-raft-cluster.yaml} (96%) rename src/tests/bundles/{kinetic-raft.yaml => mantic-raft.yaml} (95%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 6daf4ea..ef44f8b 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -81,3 +81,35 @@ bases: - 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] diff --git a/osci.yaml b/osci.yaml index 18da9f8..6106304 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,17 +6,17 @@ - jammy-mysql8 - jammy-raft - jammy-raft-cluster - - kinetic-mysql8: + - mantic-mysql8: voting: false - - kinetic-raft: + - mantic-raft: voting: false - - kinetic-raft-cluster: + - mantic-raft-cluster: voting: false vars: needs_charm_build: true charm_build_name: vault build_type: charmcraft - charmcraft_channel: 2.2/stable + charmcraft_channel: 2.x/edge - job: name: jammy-mysql8 @@ -43,23 +43,23 @@ vars: tox_extra_args: '-- jammy-raft-cluster' - job: - name: kinetic-mysql8 + name: mantic-mysql8 parent: func-target dependencies: - jammy-mysql8 vars: - tox_extra_args: '-- kinetic-mysql8' + tox_extra_args: '-- mantic-mysql8' - job: - name: kinetic-raft + name: mantic-raft parent: func-target dependencies: - jammy-mysql8 vars: - tox_extra_args: '-- kinetic-raft' + tox_extra_args: '-- mantic-raft' - job: - name: kinetic-raft-cluster + name: mantic-raft-cluster parent: func-target dependencies: - jammy-mysql8 vars: - tox_extra_args: '-- kinetic-raft-cluster' + tox_extra_args: '-- mantic-raft-cluster' diff --git a/src/metadata.yaml b/src/metadata.yaml index 5c753bc..7983003 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -17,6 +17,7 @@ tags: series: - jammy - lunar +- mantic extra-bindings: access: external: diff --git a/src/tests/bundles/kinetic-mysql8.yaml b/src/tests/bundles/mantic-mysql8.yaml similarity index 96% rename from src/tests/bundles/kinetic-mysql8.yaml rename to src/tests/bundles/mantic-mysql8.yaml index 9ae7cc5..ef172bf 100644 --- a/src/tests/bundles/kinetic-mysql8.yaml +++ b/src/tests/bundles/mantic-mysql8.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: kinetic +series: mantic comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -45,7 +45,7 @@ applications: vault: num_units: 1 - charm: ../../../vault_ubuntu-23.04-amd64.charm + charm: ../../../vault_ubuntu-23.10-amd64.charm to: - '3' diff --git a/src/tests/bundles/kinetic-raft-cluster.yaml b/src/tests/bundles/mantic-raft-cluster.yaml similarity index 96% rename from src/tests/bundles/kinetic-raft-cluster.yaml rename to src/tests/bundles/mantic-raft-cluster.yaml index cad308b..587975a 100644 --- a/src/tests/bundles/kinetic-raft-cluster.yaml +++ b/src/tests/bundles/mantic-raft-cluster.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: kinetic +series: mantic comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -44,7 +44,7 @@ applications: vault: num_units: 3 - charm: ../../../vault_ubuntu-23.04-amd64.charm + charm: ../../../vault_ubuntu-23.10-amd64.charm to: - '3' - '11' diff --git a/src/tests/bundles/kinetic-raft.yaml b/src/tests/bundles/mantic-raft.yaml similarity index 95% rename from src/tests/bundles/kinetic-raft.yaml rename to src/tests/bundles/mantic-raft.yaml index 7c0ca71..27c8fdd 100644 --- a/src/tests/bundles/kinetic-raft.yaml +++ b/src/tests/bundles/mantic-raft.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: kinetic +series: mantic comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -42,7 +42,7 @@ applications: vault: num_units: 1 - charm: ../../../vault_ubuntu-23.04-amd64.charm + charm: ../../../vault_ubuntu-23.10-amd64.charm to: - '3' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index ef67cc4..0c31483 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -9,9 +9,9 @@ gate_bundles: - jammy-mysql8 dev_bundles: -- kinetic-raft -- kinetic-raft-cluster -- kinetic-mysql8 +- mantic-raft +- mantic-raft-cluster +- mantic-mysql8 smoke_bundles: - jammy-mysql8 @@ -38,6 +38,6 @@ tests: tests_options: force_deploy: - - kinetic-raft - - kinetic-raft-cluster - - kinetic-mysql8 + - mantic-raft + - mantic-raft-cluster + - mantic-mysql8