Add xena bundles

- add non-voting focal-xena bundle - add non-voting impish-xena bundle - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 Change-Id: I3a3e37fa673e76d92d3ba51874d5147da8c1c18a
2021-09-27 15:23:13 +01:00 · 2021-09-27 15:23:13 +01:00 · 5627cc9f7d
parent e8281c49a9
commit 5627cc9f7d
10 changed files with 413 additions and 7 deletions
--- a/osci.yaml
+++ b/osci.yaml
@ -10,8 +10,12 @@
      - focal-ussuri
      - focal-victoria
      - focal-wallaby
+      - focal-xena:
+          voting: false
      - groovy-victoria
      - hirsute-wallaby
+      - impish-xena:
+          voting: false
    vars:
      needs_charm_build: true
      charm_build_name: neutron-api-plugin-arista
--- a/pip.sh
+++ b/pip.sh
@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of tox.ini for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# setuptools 58.0 dropped the support for use_2to3=true which is needed to
+# install blessings (an indirect dependency of charm-tools).
+#
+# More details on the beahvior of tox and virtualenv creation can be found at
+# https://github.com/tox-dev/tox/issues/448
+#
+# This script is wrapper to force the use of the pinned versions early in the
+# process when the virtualenv was created and upgraded before installing the
+# depedencies declared in the target.
+pip install 'pip<20.3' 'setuptools<50.0.0'
+pip "$@"
--- a/2
+++ b/2
@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-beb126d4-64d9-11eb-8a5a-0b9c14b07681
+53daf3b6-1178-11ec-b781-57275379a72b
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/focal-xena.yaml
@ -0,0 +1,180 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-xena
+
+series: &series focal
+
+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
+  mysql-innodb-cluster:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      enable-ml2-dns: False
+      flat-network-providers: default
+      vlan-ranges: default:1000:3000
+      vni-ranges: 1001:2000
+      neutron-security-groups: True
+      overlay-network-type: vxlan
+      use-internal-endpoints: True
+      enable-l3ha: True
+      dhcp-agents-per-network: 2
+      enable-ml2-port-security: True
+      default-tenant-network-type: vlan
+      l2-population: False
+      ipv4-ptr-zone-prefix-size:
+      reverse-dns-lookup: False
+      dns-domain:
+      manage-neutron-plugin-legacy-mode: False
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      prevent-arp-spoofing: True
+      firewall-driver: openvswitch
+      enable-local-dhcp-and-metadata: True
+      bridge-mappings: default:br-data
+      data-port: ens7
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+
+  neutron-api-plugin-arista:
+    charm: ../../../neutron-api-plugin-arista
+    num_units: 0
+    options:
+      source: *openstack-origin
+
+      # Fake IP, will be set to arista-virt-test-fixture's IP address on test
+      # setup:
+      eapi-host: 192.0.2.42
+      eapi-username: admin
+      eapi-password: password123
+      api-type: EAPI
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    constraints: mem=4G cores=4
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+
+  lldpd:
+    charm: cs:lldpd
+    options:
+      interfaces-regex: 'en*'
+      short-name: true
+
+  arista-virt-test-fixture:
+    charm: cs:~openstack-charmers-next/arista-virt-test-fixture
+    num_units: 1
+    constraints: mem=4G
+
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - nova-cloud-controller:shared-db
+  - nova-mysql-router:shared-db
+- - glance:shared-db
+  - glance-mysql-router:shared-db
+- - neutron-api:shared-db
+  - neutron-mysql-router:shared-db
+- - placement:shared-db
+  - placement-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
+
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-openvswitch:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-compute:image-service
+  - glance:image-service
+- - nova-cloud-controller:cloud-compute
+  - nova-compute:cloud-compute
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-compute:neutron-plugin
+  - neutron-openvswitch:neutron-plugin
+- - neutron-openvswitch:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - neutron-api
+  - neutron-api-plugin-arista
+- - neutron-api:neutron-plugin-api-subordinate
+  - neutron-api-plugin-arista:neutron-plugin-api-subordinate
+- - lldpd
+  - nova-compute
+- - placement:identity-service
+  - keystone:identity-service
+- - placement:placement
+  - nova-cloud-controller:placement
--- a/src/tests/bundles/impish-xena.yaml
+++ b/src/tests/bundles/impish-xena.yaml
@ -0,0 +1,184 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series impish
+
+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
+  mysql-innodb-cluster:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      enable-ml2-dns: False
+      flat-network-providers: default
+      vlan-ranges: default:1000:3000
+      vni-ranges: 1001:2000
+      neutron-security-groups: True
+      overlay-network-type: vxlan
+      use-internal-endpoints: True
+      enable-l3ha: True
+      dhcp-agents-per-network: 2
+      enable-ml2-port-security: True
+      default-tenant-network-type: vlan
+      l2-population: False
+      ipv4-ptr-zone-prefix-size:
+      reverse-dns-lookup: False
+      dns-domain:
+      manage-neutron-plugin-legacy-mode: False
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      prevent-arp-spoofing: True
+      firewall-driver: openvswitch
+      enable-local-dhcp-and-metadata: True
+      bridge-mappings: default:br-data
+      data-port: ens7
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+
+  neutron-api-plugin-arista:
+    charm: ../../../neutron-api-plugin-arista
+    num_units: 0
+    options:
+      source: *openstack-origin
+
+      # Fake IP, will be set to arista-virt-test-fixture's IP address on test
+      # setup:
+      eapi-host: 192.0.2.42
+      eapi-username: admin
+      eapi-password: password123
+      api-type: EAPI
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    constraints: mem=4G cores=4
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+
+  lldpd:
+    charm: cs:lldpd
+    options:
+      interfaces-regex: 'en*'
+      short-name: true
+
+  arista-virt-test-fixture:
+    # NOTE(lourot): workaround - this charm doesn't work on hirsute+ yet
+    # see https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/11
+    series: groovy
+
+    charm: cs:~openstack-charmers-next/arista-virt-test-fixture
+    num_units: 1
+    constraints: mem=4G
+
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - nova-cloud-controller:shared-db
+  - nova-mysql-router:shared-db
+- - glance:shared-db
+  - glance-mysql-router:shared-db
+- - neutron-api:shared-db
+  - neutron-mysql-router:shared-db
+- - placement:shared-db
+  - placement-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
+
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-openvswitch:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-compute:image-service
+  - glance:image-service
+- - nova-cloud-controller:cloud-compute
+  - nova-compute:cloud-compute
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-compute:neutron-plugin
+  - neutron-openvswitch:neutron-plugin
+- - neutron-openvswitch:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - neutron-api
+  - neutron-api-plugin-arista
+- - neutron-api:neutron-plugin-api-subordinate
+  - neutron-api-plugin-arista:neutron-plugin-api-subordinate
+- - lldpd
+  - nova-compute
+- - placement:identity-service
+  - keystone:identity-service
+- - placement:placement
+  - nova-cloud-controller:placement
--- a/src/tests/bundles/overlays/focal-xena.yaml.j2
+++ b/src/tests/bundles/overlays/focal-xena.yaml.j2
@ -0,0 +1 @@
+arista-virt-test-fixture-image.yaml.j2
--- a/src/tests/bundles/overlays/impish-xena.yaml.j2
+++ b/src/tests/bundles/overlays/impish-xena.yaml.j2
@ -0,0 +1 @@
+arista-virt-test-fixture-image.yaml.j2
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@ -11,12 +11,14 @@ gate_bundles:
 - focal-ussuri
 - focal-victoria
 - focal-wallaby
- groovy-victoria
+- hirsute-wallaby

 dev_bundles:
 - xenial-queens
 - bionic-rocky
- hirsute-wallaby
+- focal-xena
+- groovy-victoria
+- impish-xena

 before_deploy:
 - zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
@ -29,4 +31,5 @@ tests:

 tests_options:
  force_deploy:
-    - hirsute-wallaby
+    - groovy-victoria
+    - impish-xena
--- a/src/tox.ini
+++ b/src/tox.ini
@ -22,12 +22,12 @@ skip_missing_interpreters = False
 requires = pip < 20.3
           virtualenv < 20.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.2.0
+minversion = 3.18.0

 [testenv]
 setenv = VIRTUAL_ENV={envdir}
         PYTHONHASHSEED=0
-whitelist_externals = juju
+allowlist_externals = juju
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
--- a/tox.ini
+++ b/tox.ini
@ -11,6 +11,21 @@ envlist = pep8,py3
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
+# NOTES:
+# * We avoid the new dependency resolver by pinning pip < 20.3, see
+#   https://github.com/pypa/pip/issues/9187
+# * Pinning dependencies requires tox >= 3.2.0, see
+#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
+# * It is also necessary to pin virtualenv as a newer virtualenv would still
+#   lead to fetching the latest pip in the func* tox targets, see
+#   https://stackoverflow.com/a/38133283
+requires =
+  pip < 20.3
+  virtualenv < 20.0
+  setuptools<50.0.0
+
+# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
+minversion = 3.18.0

 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
         JUJU_REPOSITORY={toxinidir}/build
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
-  pip install {opts} {packages}
+  {toxinidir}/pip.sh install {opts} {packages}
 deps =
    -r{toxinidir}/requirements.txt