Update to build using charmcraft

Due to a build problem with the reactive plugin, this change falls back on overriding the steps and doing a manual build, but it also ensures the CI system builds the charm using charmcraft. Changes: - add a build-requirements.txt - modify charmcraft.yaml - modify osci.yaml -> indicate build with charmcraft - modify tox.ini -> tox -e build does charmcraft build/rename -> tox -e build-reactive does the reactive build - modify bundles to use the <charm>.charm artifact in tests. and fix deprecation warning re: prefix - tox inception to enable tox -e func-test in the CI func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/708 Change-Id: I4652834f5a4dd681563488cd340dac27dbf70075 Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
2022-01-27 15:22:31 +00:00 · 2022-01-27 15:22:31 +00:00 · af690f28af
commit af690f28af
parent d428cfb974
24 changed files with 291 additions and 307 deletions
--- a/build-requirements.txt
+++ b/build-requirements.txt
@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@ -0,0 +1,26 @@
+type: charm
+
+parts:
+  charm:
+    build-packages:
+      - tox
+      - git
+      - python3-dev
+      - libmysqlclient-dev  # for executable mysql_shell
+    override-build: |
+      apt-get install ca-certificates -y
+      tox -e build-reactive
+    override-stage: |
+      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
+      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
+      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
+    override-prime: |
+      # For some reason, the normal priming chokes on the fact that there's a
+      # hooks directory.
+      cp -r $CHARMCRAFT_STAGE/* .
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64
--- a/metadata.yaml
+++ b/metadata.yaml
@ -0,0 +1 @@
+src/metadata.yaml
--- a/osci.yaml
+++ b/osci.yaml
@ -1,11 +1,11 @@
 - project:
    templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
    check:
      jobs:
      - focal
      - full_model-focal-full-ha
-      - full_model-hirsute-full-ha
      - full_model-impish-full-ha:
          voting: false
      - full_model-jammy-full-ha:
@ -13,29 +13,26 @@
    vars:
      needs_charm_build: true
      charm_build_name: mysql-innodb-cluster
+      build_type: charmcraft

 - job:
    name: full_model-focal-full-ha
    parent: func-target
-    dependencies: &smoke-jobs
-        - focal
+    dependencies:
+      - focal
    vars:
      tox_extra_args: full_model:focal-full-ha
- job:
-    name: full_model-hirsute-full-ha
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: full_model:hirsute-full-ha
 - job:
    name: full_model-impish-full-ha
    parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - focal
    vars:
      tox_extra_args: full_model:impish-full-ha
 - job:
    name: full_model-jammy-full-ha
    parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - focal
    vars:
      tox_extra_args: full_model:jammy-full-ha
--- a/rename.sh
+++ b/rename.sh
@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@ -9,8 +9,6 @@ tags:
 subordinate: false
 series:
 - focal
- groovy
- hirsute
 - impish
 provides:
  shared-db:
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@ -4,6 +4,9 @@
 #     https://github.com/openstack-charmers/release-tools
 #

+# Need tox to be available from tox... inception yes, but its a workaround for now
+tox
+
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
--- a/src/tests/bundles/focal-full.yaml
+++ b/src/tests/bundles/focal-full.yaml
@ -1,69 +1,86 @@
 variables:
  openstack-origin: &openstack-origin distro-proposed

+local_overlay_enabled: False
+
 series: &series focal

 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  nova-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  neutron-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
    options:
      source: *openstack-origin
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
    num_units: 1
    options:
      source: *openstack-origin
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
  ovn-central:
-    charm: cs:~openstack-charmers-next/ovn-central
+    charm: ch:ovn-central
    num_units: 3
    options:
      source: *openstack-origin
+    channel: latest/edge
  neutron-api-plugin-ovn:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
+    charm: ch:neutron-api-plugin-ovn
+    channel: latest/edge
  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
    series: *series
    num_units: 1
    options:
      flat-network-providers: physnet1
      neutron-security-groups: true
      openstack-origin: *openstack-origin
+    channel: latest/edge
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
    num_units: 1
    options:
      network-manager: Neutron
      openstack-origin: *openstack-origin
+    channel: latest/edge
  ovn-chassis:
-    charm: cs:~openstack-charmers-next/ovn-chassis
+    charm: ch:ovn-chassis
+    channel: latest/edge
  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
    num_units: 1
    options:
      config-flags: default_ephemeral_format=ext4
@ -71,11 +88,13 @@ applications:
      enable-resize: true
      migration-auth-type: ssh
      openstack-origin: *openstack-origin
+    channel: latest/edge
  placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  memcached:
    charm: cs:memcached
    num_units: 1
--- a/src/tests/bundles/focal.yaml
+++ b/src/tests/bundles/focal.yaml
@ -1,19 +1,25 @@
+local_overlay_enabled: False
+
 series: focal
 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
    series: focal
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
 relations:
  - - vault:certificates
    - mysql-innodb-cluster:certificates
--- a/src/tests/bundles/hirsute-full-ha.yaml
+++ b/src/tests/bundles/hirsute-full-ha.yaml
@ -1 +0,0 @@
-hirsute-full.yaml
--- a/src/tests/bundles/hirsute-full.yaml
+++ b/src/tests/bundles/hirsute-full.yaml
@ -1,161 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series hirsute
-
-applications:
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-  ovn-central:
-    charm: cs:~openstack-charmers-next/ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-  neutron-api-plugin-ovn:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    series: *series
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-  ovn-chassis:
-    charm: cs:~openstack-charmers-next/ovn-chassis
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  memcached:
-    charm: cs:memcached
-    num_units: 1
-    series: focal
-relations:
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:neutron-api
-    - nova-cloud-controller:neutron-api
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - placement:identity-service
-    - keystone:identity-service
-  - - placement:placement
-    - nova-cloud-controller:placement
-  - - neutron-api-plugin-ovn:neutron-plugin
-    - neutron-api:neutron-plugin-api-subordinate
-  - - ovn-central:certificates
-    - vault:certificates
-  - - ovn-central:ovsdb-cms
-    - neutron-api-plugin-ovn:ovsdb-cms
-  - - neutron-api:certificates
-    - vault:certificates
-  - - ovn-chassis:nova-compute
-    - nova-compute:neutron-plugin
-  - - ovn-chassis:certificates
-    - vault:certificates
-  - - ovn-chassis:ovsdb
-    - ovn-central:ovsdb
-  - - vault:certificates
-    - neutron-api-plugin-ovn:certificates
-  - - vault:certificates
-    - glance:certificates
-  - - vault:certificates
-    - keystone:certificates
-  - - vault:certificates
-    - nova-cloud-controller:certificates
-  - - vault:certificates
-    - placement:certificates
-  - - vault:certificates
-    - mysql-innodb-cluster:certificates
-  - - memcached:cache
-    - nova-cloud-controller:memcache
-  - - keystone:shared-db
-    - keystone-mysql-router:shared-db
-  - - glance:shared-db
-    - glance-mysql-router:shared-db
-  - - nova-cloud-controller:shared-db
-    - nova-mysql-router:shared-db
-  - - neutron-api:shared-db
-    - neutron-mysql-router:shared-db
-  - - placement:shared-db
-    - placement-mysql-router:shared-db
-  - - vault:shared-db
-    - vault-mysql-router:shared-db
-  - - keystone-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - nova-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - glance-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - neutron-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - placement-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - vault-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
--- a/src/tests/bundles/hirsute.yaml
+++ b/src/tests/bundles/hirsute.yaml
@ -1,28 +0,0 @@
-series: hirsute
-applications:
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
-    num_units: 3
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-relations:
-  - - vault:certificates
-    - mysql-innodb-cluster:certificates
-  - - vault:certificates
-    - keystone:certificates
-  - - keystone:shared-db
-    - keystone-mysql-router:shared-db
-  - - vault:shared-db
-    - vault-mysql-router:shared-db
-  - - keystone-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - vault-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
--- a/src/tests/bundles/impish-full.yaml
+++ b/src/tests/bundles/impish-full.yaml
@ -1,69 +1,86 @@
 variables:
  openstack-origin: &openstack-origin distro

+local_overlay_enabled: False
+
 series: &series impish

 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  nova-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  neutron-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
    options:
      source: *openstack-origin
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
    num_units: 1
    options:
      source: *openstack-origin
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
  ovn-central:
-    charm: cs:~openstack-charmers-next/ovn-central
+    charm: ch:ovn-central
    num_units: 3
    options:
      source: *openstack-origin
+    channel: latest/edge
  neutron-api-plugin-ovn:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
+    charm: ch:neutron-api-plugin-ovn
+    channel: latest/edge
  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
    series: *series
    num_units: 1
    options:
      flat-network-providers: physnet1
      neutron-security-groups: true
      openstack-origin: *openstack-origin
+    channel: latest/edge
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
    num_units: 1
    options:
      network-manager: Neutron
      openstack-origin: *openstack-origin
+    channel: latest/edge
  ovn-chassis:
-    charm: cs:~openstack-charmers-next/ovn-chassis
+    charm: ch:ovn-chassis
+    channel: latest/edge
  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
    num_units: 1
    options:
      config-flags: default_ephemeral_format=ext4
@ -71,11 +88,13 @@ applications:
      enable-resize: true
      migration-auth-type: ssh
      openstack-origin: *openstack-origin
+    channel: latest/edge
  placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  memcached:
    charm: cs:memcached
    num_units: 1
--- a/src/tests/bundles/impish.yaml
+++ b/src/tests/bundles/impish.yaml
@ -1,18 +1,24 @@
+local_overlay_enabled: False
+
 series: impish
 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
 relations:
  - - vault:certificates
    - mysql-innodb-cluster:certificates
--- a/src/tests/bundles/jammy-full-ha.yaml
+++ b/src/tests/bundles/jammy-full-ha.yaml
@ -1,69 +1,86 @@
 variables:
  openstack-origin: &openstack-origin distro

+local_overlay_enabled: False
+
 series: &series jammy

 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  nova-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  neutron-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
    options:
      source: *openstack-origin
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
    num_units: 1
    options:
      source: *openstack-origin
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
  ovn-central:
-    charm: cs:~openstack-charmers-next/ovn-central
+    charm: ch:ovn-central
    num_units: 3
    options:
      source: *openstack-origin
+    channel: latest/edge
  neutron-api-plugin-ovn:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
+    charm: ch:neutron-api-plugin-ovn
+    channel: latest/edge
  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
    series: *series
    num_units: 1
    options:
      flat-network-providers: physnet1
      neutron-security-groups: true
      openstack-origin: *openstack-origin
+    channel: latest/edge
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
    num_units: 1
    options:
      network-manager: Neutron
      openstack-origin: *openstack-origin
+    channel: latest/edge
  ovn-chassis:
-    charm: cs:~openstack-charmers-next/ovn-chassis
+    charm: ch:ovn-chassis
+    channel: latest/edge
  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
    num_units: 1
    options:
      config-flags: default_ephemeral_format=ext4
@ -71,11 +88,13 @@ applications:
      enable-resize: true
      migration-auth-type: ssh
      openstack-origin: *openstack-origin
+    channel: latest/edge
  placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  memcached:
    charm: cs:memcached
    num_units: 1
--- a/src/tests/bundles/jammy-full.yaml
+++ b/src/tests/bundles/jammy-full.yaml
@ -1,69 +1,86 @@
 variables:
  openstack-origin: &openstack-origin distro

+local_overlay_enabled: False
+
 series: &series jammy

 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  nova-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  neutron-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
    options:
      source: *openstack-origin
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
    num_units: 1
    options:
      source: *openstack-origin
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
  ovn-central:
-    charm: cs:~openstack-charmers-next/ovn-central
+    charm: ch:ovn-central
    num_units: 3
    options:
      source: *openstack-origin
+    channel: latest/edge
  neutron-api-plugin-ovn:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
+    charm: ch:neutron-api-plugin-ovn
+    channel: latest/edge
  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
    series: *series
    num_units: 1
    options:
      flat-network-providers: physnet1
      neutron-security-groups: true
      openstack-origin: *openstack-origin
+    channel: latest/edge
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
    num_units: 1
    options:
      network-manager: Neutron
      openstack-origin: *openstack-origin
+    channel: latest/edge
  ovn-chassis:
-    charm: cs:~openstack-charmers-next/ovn-chassis
+    charm: ch:ovn-chassis
+    channel: latest/edge
  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
    num_units: 1
    options:
      config-flags: default_ephemeral_format=ext4
@ -71,11 +88,13 @@ applications:
      enable-resize: true
      migration-auth-type: ssh
      openstack-origin: *openstack-origin
+    channel: latest/edge
  placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
    num_units: 1
    options:
      openstack-origin: *openstack-origin
+    channel: latest/edge
  memcached:
    charm: cs:memcached
    num_units: 1
--- a/src/tests/bundles/jammy.yaml
+++ b/src/tests/bundles/jammy.yaml
@ -1,18 +1,24 @@
+local_overlay_enabled: False
+
 series: jammy
 applications:
  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster
+    charm: ../../../mysql-innodb-cluster.charm
    num_units: 3
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
    num_units: 1
+    channel: latest/edge
  vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
    num_units: 1
+    channel: latest/edge
 relations:
  - - vault:certificates
    - mysql-innodb-cluster:certificates
--- a/src/tests/bundles/overlays/focal-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/focal-full-ha.yaml.j2
@ -8,9 +8,11 @@ applications:
    options:
      vip: {{TEST_VIP01}}
  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
  nova-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]
--- a/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2
@ -8,9 +8,11 @@ applications:
    options:
      vip: {{TEST_VIP01}}
  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
  nova-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]
--- a/src/tests/bundles/overlays/impish-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/impish-full-ha.yaml.j2
@ -8,9 +8,11 @@ applications:
    options:
      vip: {{TEST_VIP01}}
  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
  nova-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]
--- a/src/tests/bundles/overlays/jammy-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/jammy-full-ha.yaml.j2
@ -8,9 +8,11 @@ applications:
    options:
      vip: {{TEST_VIP01}}
  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
  nova-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
+    channel: latest/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@ -27,10 +27,8 @@ tests:

 gate_bundles:
 - scale_in_out: focal
- scale_in_out: hirsute
 - scale_in_out: impish
 - full_model: focal-full-ha
- full_model: hirsute-full-ha
 - full_model: impish-full-ha

 smoke_bundles:
@ -42,8 +40,6 @@ dev_bundles:

 tests_options:
  force_deploy:
-    - hirsute
-    - hirsute-full-ha
    - impish
    - impish-full-ha
    - jammy
@ -52,13 +48,13 @@ tests_options:
 target_deploy_status:
  neutron-api-plugin-ovn:
    workload-status: waiting
-    workload-status-message: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete"
+    workload-status-message-prefix: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete"
  ovn-central:
    workload-status: waiting
-    workload-status-message: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data"
+    workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data"
  ovn-chassis:
    workload-status: waiting
-    workload-status-message: "'certificates' awaiting server certificate data"
+    workload-status-message-prefix: "'certificates' awaiting server certificate data"
  vault:
    workload-status: blocked
-    workload-status-message: Vault needs to be initialized
+    workload-status-message-prefix: Vault needs to be initialized
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6'
 requests>=2.18.4
 charms.reactive

+# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
+# f'{something}'
+mock>=1.2,<4.0.0; python_version < '3.6'
+mock>=1.2; python_version >= '3.6'
+
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
@ -46,3 +51,4 @@ pbr==5.6.0       # vault
 cryptography<3.4 # vault, keystone-saml-mellon
 lxml             # keystone-saml-mellon
 hvac             # vault, barbican-vault
+psutil           # cinder-lvm
--- a/tox.ini
+++ b/tox.ini
@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
  {toxinidir}/pip.sh install {opts} {packages}
+allowlist_externals =
+    charmcraft
+    bash
+    tox
+    rename.sh
 deps =
    -r{toxinidir}/requirements.txt

 [testenv:build]
 basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:build-reactive]
+basepython = python3
 commands =
    charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}

@ -86,6 +99,18 @@ deps = flake8==3.9.2
       charm-tools==2.8.3
 commands = flake8 {posargs} src unit_tests

+[testenv:func-target]
+# Hack to get functional tests working in the charmcraft
+# world. We should fix this.
+basepython = python3
+passenv = HOME TERM CS_* OS_* TEST_*
+deps = -r{toxinidir}/src/test-requirements.txt
+changedir = {toxinidir}/src
+commands =
+  bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
+  tox --version
+  tox -e func-target {posargs}
+
 [testenv:cover]
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini