Updates for jammy enablement

- charmcraft: build-on 20.04 -> run-on 20.04/22.04 [*archs] - Refresh tox targets - Drop impish bundles and OSCI testing - Add jammy metadata Change-Id: I3d3fb9ef936cdbf87f1faf7845156e7b72c644c3
2022-04-05 11:49:20 +01:00 · 2022-04-05 11:49:20 +01:00 · 38610b7e4a
parent d9a1bb7965
commit 38610b7e4a
10 changed files with 16 additions and 246 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -1,4 +1,4 @@
 - project:
    templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-charm-yoga-jobs
      - openstack-cover-jobs
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@ -20,7 +20,15 @@ parts:
      cp -r $CHARMCRAFT_STAGE/* .

 bases:
-  - name: ubuntu
-    channel: "20.04"
-    architectures:
-      - amd64
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
--- a/osci.yaml
+++ b/osci.yaml
@ -1,17 +1,13 @@
 - project:
    templates:
      - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
    check:
      jobs:
      - focal
-      - impish:
-          voting: false
      - jammy:
          voting: false
      - full_model_ha-focal-full-ha
-      - full_model_ha-impish-full-ha:
-          voting: false
      - full_model_ha-jammy-full-ha:
          voting: false
    vars:
@ -26,13 +22,6 @@
      - focal
    vars:
      tox_extra_args: full_model_ha:focal-full-ha
- job:
-    name: full_model_ha-impish-full-ha
-    parent: func-target
-    dependencies:
-      - focal
-    vars:
-      tox_extra_args: full_model_ha:impish-full-ha
 - job:
    name: full_model_ha-jammy-full-ha
    parent: func-target
--- a/src/tests/bundles/impish-full-ha.yaml
+++ b/src/tests/bundles/impish-full-ha.yaml
@ -1 +0,0 @@
-impish-full.yaml
--- a/src/tests/bundles/impish-full.yaml
+++ b/src/tests/bundles/impish-full.yaml
@ -1,173 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: &series impish
-
-applications:
-  keystone-mysql-router:
-    charm: ../../../mysql-router.charm
-  nova-mysql-router:
-    charm: ../../../mysql-router.charm
-  glance-mysql-router:
-    charm: ../../../mysql-router.charm
-  neutron-mysql-router:
-    charm: ../../../mysql-router.charm
-  placement-mysql-router:
-    charm: ../../../mysql-router.charm
-  vault-mysql-router:
-    charm: ../../../mysql-router.charm
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  neutron-api-plugin-ovn:
-    charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
-  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: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  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: ch:ovn-chassis
-    channel: latest/edge
-  nova-compute:
-    charm: ch: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
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  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
-  - - 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/impish.yaml
+++ b/src/tests/bundles/impish.yaml
@ -1,33 +0,0 @@
-local_overlay_enabled: False
-
-series: impish
-applications:
-  keystone-mysql-router:
-    charm: ../../../mysql-router.charm
-  vault-mysql-router:
-    charm: ../../../mysql-router.charm
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
-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/overlays/hirsute-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2
@ -1 +0,0 @@
-full-ha.yaml.j2
--- a/src/tests/bundles/overlays/impish-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/impish-full-ha.yaml.j2
@ -1 +0,0 @@
-full-ha.yaml.j2
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@ -23,7 +23,6 @@ tests:

 gate_bundles:
 - full_model_ha: focal-full-ha
- full_model_ha: impish-full-ha

 dev_bundles:
 - full_model_ha: jammy-full-ha
@ -36,8 +35,6 @@ tests_options:
    principle-app-name: keystone
    hacluster-charm-name: hacluster
  force_deploy:
-   - impish
-   - impish-full-ha
   - jammy
   - jammy-full-ha

--- a/tox.ini
+++ b/tox.ini
@ -68,28 +68,13 @@ basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}

-[testenv:py35]
-basepython = python3.5
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py36]
-basepython = python3.6
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
 [testenv:py38]
 basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}

-[testenv:py39]
-basepython = python3.9
+[testenv:py310]
+basepython = python3.10
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}