From e7da0946d1e8645d77e391522352a010f17e4efa Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 27 Sep 2021 14:48:40 +0100 Subject: [PATCH] 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: I61938ea31a9825b83260316af0b7ad4960b39a5b --- pip.sh | 18 + rebuild | 2 +- .../focal-xena-pacemaker-remote-ssl.yaml | 390 ++++++++++++++++++ .../impish-xena-pacemaker-remote-ssl.yaml | 390 ++++++++++++++++++ ...focal-wallaby-pacemaker-remote-ssl-yaml.j2 | 1 + .../focal-xena-pacemaker-remote-ssl-yaml.j2 | 1 + ...rsute-wallaby-pacemaker-remote-ssl-yaml.j2 | 1 + .../impish-xena-pacemaker-remote-ssl-yaml.j2 | 1 + src/tests/tests.yaml | 5 +- src/tox.ini | 4 +- tox.ini | 17 +- 11 files changed, 825 insertions(+), 5 deletions(-) create mode 100755 pip.sh create mode 100644 src/tests/bundles/focal-xena-pacemaker-remote-ssl.yaml create mode 100644 src/tests/bundles/impish-xena-pacemaker-remote-ssl.yaml create mode 120000 src/tests/bundles/overlays/focal-wallaby-pacemaker-remote-ssl-yaml.j2 create mode 120000 src/tests/bundles/overlays/focal-xena-pacemaker-remote-ssl-yaml.j2 create mode 120000 src/tests/bundles/overlays/hirsute-wallaby-pacemaker-remote-ssl-yaml.j2 create mode 120000 src/tests/bundles/overlays/impish-xena-pacemaker-remote-ssl-yaml.j2 diff --git a/pip.sh b/pip.sh new file mode 100755 index 0000000..9a7e6b0 --- /dev/null +++ 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 "$@" diff --git a/rebuild b/rebuild index 248232c..ee156ba 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -fa1b7830-b3eb-11eb-b9e2-d3549354239f +53d5a834-1178-11ec-8935-63498151ebde diff --git a/src/tests/bundles/focal-xena-pacemaker-remote-ssl.yaml b/src/tests/bundles/focal-xena-pacemaker-remote-ssl.yaml new file mode 100644 index 0000000..2331cf9 --- /dev/null +++ b/src/tests/bundles/focal-xena-pacemaker-remote-ssl.yaml @@ -0,0 +1,390 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-xena + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + constraints: mem=4096M + '9': + constraints: mem=4096M + '10': + constraints: mem=4096M + '11': + '12': + '13': + '14': + '15': + '16': + '17': + '18': + '19': + '20': + '21': + '22': + '23': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + masakari-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '3' + + cinder: + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + openstack-origin: *openstack-origin + block-device: "None" + glance-api-version: 2 + to: + - '4' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + admin-password: openstack + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '5' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '6' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + bridge-mappings: physnet1:br-ex + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '7' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + debug: true + to: + - '23' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 3 + constraints: mem=4G + options: + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + openstack-origin: *openstack-origin + debug: true + cpu-model: kvm64 + cpu-mode: custom + # Allow for more retries when testing ontop of openstack + config-flags: block_device_allocate_retries=120 + to: + - '8' + - '9' + - '10' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '11' + + masakari: + charm: cs:~openstack-charmers-next/masakari + num_units: 3 + options: + openstack-origin: *openstack-origin + to: + - '12' + - '13' + - '14' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + expected-osd-count: 3 + to: + - '15' + - '16' + - '17' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + constraints: mem=1G + num_units: 3 + options: + source: *openstack-origin + storage: + osd-devices: cinder,40G + to: + - '18' + - '19' + - '20' + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + + masakari-monitors: + charm: ../../masakari-monitors + + hacluster: + charm: cs:~openstack-charmers-next/hacluster + options: + corosync_transport: unicast + cluster_count: 3 + + pacemaker-remote: + charm: cs:~openstack-charmers-next/pacemaker-remote + options: + enable-stonith: False + enable-resources: False + + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + to: + - '21' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '22' + +relations: + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp-nova' + - 'rabbitmq-server:amqp' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - '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' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:neutron-plugin-api' + - 'neutron-api:neutron-plugin-api' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'neutron-openvswitch:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:neutron-api' + - 'neutron-api:neutron-api' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'masakari:shared-db' + - 'masakari-mysql-router:shared-db' + - - 'masakari-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'masakari:amqp' + - 'rabbitmq-server:amqp' + + - - 'masakari:identity-service' + - 'keystone:identity-service' + + - - 'glance:ceph' + - 'ceph-mon:client' + + - - 'ceph-mon:osd' + - 'ceph-osd:mon' + + - - 'cinder:storage-backend' + - 'cinder-ceph:storage-backend' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'cinder-ceph:ceph-access' + - 'nova-compute:ceph-access' + + - - 'nova-compute:juju-info' + - 'masakari-monitors:container' + + - - 'masakari:ha' + - 'hacluster:ha' + + - - 'keystone:identity-credentials' + - 'masakari-monitors:identity-credentials' + + - - 'nova-compute:juju-info' + - 'pacemaker-remote:juju-info' + + - - 'hacluster:pacemaker-remote' + - 'pacemaker-remote:pacemaker-remote' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:certificates' + - 'keystone:certificates' + + - - 'vault:certificates' + - 'neutron-api:certificates' + + - - 'vault:certificates' + - 'cinder:certificates' + + - - 'vault:certificates' + - 'glance:certificates' + + - - 'vault:certificates' + - 'nova-cloud-controller:certificates' + + - - 'vault:certificates' + - 'masakari:certificates' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement:identity-service' + - 'keystone:identity-service' + + - - 'placement:placement' + - 'nova-cloud-controller:placement' + + - - 'vault:certificates' + - 'placement:certificates' diff --git a/src/tests/bundles/impish-xena-pacemaker-remote-ssl.yaml b/src/tests/bundles/impish-xena-pacemaker-remote-ssl.yaml new file mode 100644 index 0000000..b24a22c --- /dev/null +++ b/src/tests/bundles/impish-xena-pacemaker-remote-ssl.yaml @@ -0,0 +1,390 @@ +variables: + openstack-origin: &openstack-origin distro + +series: impish + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + constraints: mem=4096M + '9': + constraints: mem=4096M + '10': + constraints: mem=4096M + '11': + '12': + '13': + '14': + '15': + '16': + '17': + '18': + '19': + '20': + '21': + '22': + '23': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + masakari-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '3' + + cinder: + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + openstack-origin: *openstack-origin + block-device: "None" + glance-api-version: 2 + to: + - '4' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + admin-password: openstack + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '5' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '6' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + bridge-mappings: physnet1:br-ex + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + to: + - '7' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + worker-multiplier: 0.25 + debug: true + to: + - '23' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 3 + constraints: mem=4G + options: + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + openstack-origin: *openstack-origin + debug: true + cpu-model: kvm64 + cpu-mode: custom + # Allow for more retries when testing ontop of openstack + config-flags: block_device_allocate_retries=120 + to: + - '8' + - '9' + - '10' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '11' + + masakari: + charm: cs:~openstack-charmers-next/masakari + num_units: 3 + options: + openstack-origin: *openstack-origin + to: + - '12' + - '13' + - '14' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + expected-osd-count: 3 + to: + - '15' + - '16' + - '17' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + constraints: mem=1G + num_units: 3 + options: + source: *openstack-origin + storage: + osd-devices: cinder,40G + to: + - '18' + - '19' + - '20' + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + + masakari-monitors: + charm: ../../masakari-monitors + + hacluster: + charm: cs:~openstack-charmers-next/hacluster + options: + corosync_transport: unicast + cluster_count: 3 + + pacemaker-remote: + charm: cs:~openstack-charmers-next/pacemaker-remote + options: + enable-stonith: False + enable-resources: False + + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + to: + - '21' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '22' + +relations: + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp-nova' + - 'rabbitmq-server:amqp' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - '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' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:neutron-plugin-api' + - 'neutron-api:neutron-plugin-api' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'neutron-openvswitch:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:neutron-api' + - 'neutron-api:neutron-api' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'masakari:shared-db' + - 'masakari-mysql-router:shared-db' + - - 'masakari-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'masakari:amqp' + - 'rabbitmq-server:amqp' + + - - 'masakari:identity-service' + - 'keystone:identity-service' + + - - 'glance:ceph' + - 'ceph-mon:client' + + - - 'ceph-mon:osd' + - 'ceph-osd:mon' + + - - 'cinder:storage-backend' + - 'cinder-ceph:storage-backend' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'cinder-ceph:ceph-access' + - 'nova-compute:ceph-access' + + - - 'nova-compute:juju-info' + - 'masakari-monitors:container' + + - - 'masakari:ha' + - 'hacluster:ha' + + - - 'keystone:identity-credentials' + - 'masakari-monitors:identity-credentials' + + - - 'nova-compute:juju-info' + - 'pacemaker-remote:juju-info' + + - - 'hacluster:pacemaker-remote' + - 'pacemaker-remote:pacemaker-remote' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:certificates' + - 'keystone:certificates' + + - - 'vault:certificates' + - 'neutron-api:certificates' + + - - 'vault:certificates' + - 'cinder:certificates' + + - - 'vault:certificates' + - 'glance:certificates' + + - - 'vault:certificates' + - 'nova-cloud-controller:certificates' + + - - 'vault:certificates' + - 'masakari:certificates' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement:identity-service' + - 'keystone:identity-service' + + - - 'placement:placement' + - 'nova-cloud-controller:placement' + + - - 'vault:certificates' + - 'placement:certificates' diff --git a/src/tests/bundles/overlays/focal-wallaby-pacemaker-remote-ssl-yaml.j2 b/src/tests/bundles/overlays/focal-wallaby-pacemaker-remote-ssl-yaml.j2 new file mode 120000 index 0000000..4966300 --- /dev/null +++ b/src/tests/bundles/overlays/focal-wallaby-pacemaker-remote-ssl-yaml.j2 @@ -0,0 +1 @@ +bionic-rocky-pacemaker-remote.yaml.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/focal-xena-pacemaker-remote-ssl-yaml.j2 b/src/tests/bundles/overlays/focal-xena-pacemaker-remote-ssl-yaml.j2 new file mode 120000 index 0000000..4966300 --- /dev/null +++ b/src/tests/bundles/overlays/focal-xena-pacemaker-remote-ssl-yaml.j2 @@ -0,0 +1 @@ +bionic-rocky-pacemaker-remote.yaml.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/hirsute-wallaby-pacemaker-remote-ssl-yaml.j2 b/src/tests/bundles/overlays/hirsute-wallaby-pacemaker-remote-ssl-yaml.j2 new file mode 120000 index 0000000..4966300 --- /dev/null +++ b/src/tests/bundles/overlays/hirsute-wallaby-pacemaker-remote-ssl-yaml.j2 @@ -0,0 +1 @@ +bionic-rocky-pacemaker-remote.yaml.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/impish-xena-pacemaker-remote-ssl-yaml.j2 b/src/tests/bundles/overlays/impish-xena-pacemaker-remote-ssl-yaml.j2 new file mode 120000 index 0000000..4966300 --- /dev/null +++ b/src/tests/bundles/overlays/impish-xena-pacemaker-remote-ssl-yaml.j2 @@ -0,0 +1 @@ +bionic-rocky-pacemaker-remote.yaml.j2 \ No newline at end of file diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 15c9b7c..bab2803 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -25,7 +25,9 @@ dev_bundles: # Rocky disabled until https://review.opendev.org/#/c/647756/ lands in # packaging - bionic-rocky-pacemaker-remote-ssl + - focal-xena-pacemaker-remote-ssl - hirsute-wallaby-pacemaker-remote-ssl + - impish-xena-pacemaker-remote-ssl smoke_bundles: - focal-ussuri-pacemaker-remote-ssl @@ -49,4 +51,5 @@ target_deploy_status: tests_options: force_deploy: - - hirsute-wallaby-pacemaker-remote-ssl + - groovy-victoria-pacemaker-remote-ssl + - impish-xena-pacemaker-remote-ssl diff --git a/src/tox.ini b/src/tox.ini index e763047..b40d295 100644 --- 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 = diff --git a/tox.ini b/tox.ini index 5c81801..22159df 100644 --- 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