From 1d36520687efdb4f4bec138efceb18dfdfcef34d Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 5 Apr 2022 11:45:33 +0100 Subject: [PATCH] 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: I4f6daba6c6d86d4ac749bdcd60d6e9441bf458ba --- .zuul.yaml | 2 +- charmcraft.yaml | 16 +- osci.yaml | 11 +- src/metadata.yaml | 2 +- src/tests/bundles/impish-full-ha.yaml | 1 - src/tests/bundles/impish-full.yaml | 180 ------------------ src/tests/bundles/impish.yaml | 34 ---- .../bundles/overlays/hirsute-full-ha.yaml.j2 | 18 -- .../bundles/overlays/impish-full-ha.yaml.j2 | 18 -- src/tests/tests.yaml | 8 +- tox.ini | 19 +- 11 files changed, 21 insertions(+), 288 deletions(-) delete mode 120000 src/tests/bundles/impish-full-ha.yaml delete mode 100644 src/tests/bundles/impish-full.yaml delete mode 100644 src/tests/bundles/impish.yaml delete mode 100644 src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 delete mode 100644 src/tests/bundles/overlays/impish-full-ha.yaml.j2 diff --git a/.zuul.yaml b/.zuul.yaml index 0eed196..7ffc71c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-ussuri-jobs + - openstack-python3-charm-yoga-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index d3eaabc..86055a8 100644 --- 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] diff --git a/osci.yaml b/osci.yaml index c227e6a..a08348c 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,13 +1,11 @@ - project: templates: - charm-unit-jobs-py38 - - charm-unit-jobs-py39 + - charm-unit-jobs-py310 check: jobs: - focal - full_model-focal-full-ha - - full_model-impish-full-ha: - voting: false - full_model-jammy-full-ha: voting: false vars: @@ -22,13 +20,6 @@ - focal vars: tox_extra_args: full_model:focal-full-ha -- job: - name: full_model-impish-full-ha - parent: func-target - dependencies: - - focal - vars: - tox_extra_args: full_model:impish-full-ha - job: name: full_model-jammy-full-ha parent: func-target diff --git a/src/metadata.yaml b/src/metadata.yaml index 4e2ee4e..f6e6379 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -9,7 +9,7 @@ tags: subordinate: false series: - focal -- impish +- jammy provides: shared-db: interface: mysql-shared diff --git a/src/tests/bundles/impish-full-ha.yaml b/src/tests/bundles/impish-full-ha.yaml deleted file mode 120000 index e135644..0000000 --- a/src/tests/bundles/impish-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -impish-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/impish-full.yaml b/src/tests/bundles/impish-full.yaml deleted file mode 100644 index 42eadd3..0000000 --- a/src/tests/bundles/impish-full.yaml +++ /dev/null @@ -1,180 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: False - -series: &series impish - -applications: - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - mysql-innodb-cluster: - charm: ../../../mysql-innodb-cluster.charm - num_units: 3 - options: - source: *openstack-origin - 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 - - - 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 diff --git a/src/tests/bundles/impish.yaml b/src/tests/bundles/impish.yaml deleted file mode 100644 index 3cc0b6a..0000000 --- a/src/tests/bundles/impish.yaml +++ /dev/null @@ -1,34 +0,0 @@ -local_overlay_enabled: False - -series: impish -applications: - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - mysql-innodb-cluster: - charm: ../../../mysql-innodb-cluster.charm - num_units: 3 - 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 diff --git a/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 b/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 deleted file mode 100644 index 85bd5a1..0000000 --- a/src/tests/bundles/overlays/hirsute-full-ha.yaml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -applications: - keystone: - num_units: 3 - options: - vip: {{TEST_VIP00}} - nova-cloud-controller: - num_units: 3 - options: - vip: {{TEST_VIP01}} - keystone-hacluster: - charm: ch:hacluster - channel: latest/edge - nova-hacluster: - charm: ch:hacluster - channel: latest/edge -relations: -- ["keystone:ha", "keystone-hacluster:ha"] -- ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/bundles/overlays/impish-full-ha.yaml.j2 b/src/tests/bundles/overlays/impish-full-ha.yaml.j2 deleted file mode 100644 index 85bd5a1..0000000 --- a/src/tests/bundles/overlays/impish-full-ha.yaml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -applications: - keystone: - num_units: 3 - options: - vip: {{TEST_VIP00}} - nova-cloud-controller: - num_units: 3 - options: - vip: {{TEST_VIP01}} - keystone-hacluster: - charm: ch:hacluster - channel: latest/edge - nova-hacluster: - charm: ch:hacluster - channel: latest/edge -relations: -- ["keystone:ha", "keystone-hacluster:ha"] -- ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index c07070c..6e5310c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -27,9 +27,9 @@ tests: gate_bundles: - scale_in_out: focal -- scale_in_out: impish +- scale_in_out: jammy - full_model: focal-full-ha -- full_model: impish-full-ha +- full_model: jammy-full-ha smoke_bundles: - focal @@ -40,8 +40,8 @@ dev_bundles: tests_options: force_deploy: - - impish - - impish-full-ha + - jammy + - jammy-full-ha - jammy - jammy-full-ha diff --git a/tox.ini b/tox.ini index 2d60b8a..2db5420 100644 --- 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}