diff --git a/osci.yaml b/osci.yaml index 534cdee..0dda39a 100644 --- a/osci.yaml +++ b/osci.yaml @@ -4,7 +4,14 @@ check: jobs: - charm-build - - groovy-victoria + - impish-xena: + voting: false + - hirsute-wallaby: + voting: false + - focal-xena: + voting: false + - focal-wallaby: + voting: false - focal-victoria - focal-ussuri - bionic-ussuri @@ -12,4 +19,4 @@ - bionic-stein vars: needs_charm_build: true - charm_build_name: octavia-diskimage-retrofit \ No newline at end of file + charm_build_name: octavia-diskimage-retrofit 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 c467293..254731f 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 -fa42d074-b3eb-11eb-b97b-4f8eacaf2bb4 +53ea6076-1178-11ec-90df-879d6deea2a2 diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index d4271b3..18e533c 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -38,21 +38,34 @@ applications: path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(xenial|bionic|eoan)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|eoan)', + 'release~(xenial|bionic|focal)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" octavia-diskimage-retrofit: series: bionic charm: ../../../octavia-diskimage-retrofit diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 938ab7a..0fce532 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -38,21 +38,34 @@ applications: path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(xenial|bionic|eoan)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|eoan)', + 'release~(xenial|bionic|focal)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" octavia-diskimage-retrofit: series: bionic charm: ../../../octavia-diskimage-retrofit diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index e4c192a..b560337 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -38,21 +38,34 @@ applications: path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(xenial|bionic|eoan)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|eoan)', + 'release~(xenial|bionic|focal)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" octavia-diskimage-retrofit: series: bionic charm: ../../../octavia-diskimage-retrofit diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 91922f5..d17a3ac 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -40,21 +40,34 @@ applications: path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(xenial|bionic|eoan)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|eoan)', + 'release~(xenial|bionic|focal)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" # NOTE(fnordahl): We deliberately do not include retrofit-series and uca # pocket configuration options here to confirm that the charm defaults work. octavia-diskimage-retrofit: diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 4a26b6f..1f35955 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -65,17 +65,30 @@ applications: 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|focal)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" to: - '5' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index 95b5f5a..510dd34 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -65,17 +65,30 @@ applications: 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|focal)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" to: - '5' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml new file mode 100644 index 0000000..b885a09 --- /dev/null +++ b/src/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,122 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +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': + +applications: + + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + source: ppa:simplestreams-dev/trunk + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', + max: 1, + item_filters: [ + 'release~(xenial|bionic|focal)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)' + ] + }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" + to: + - '5' + + octavia-diskimage-retrofit: + charm: ../../../octavia-diskimage-retrofit + options: + retrofit-series: focal + +relations: + + - - 'glance-simplestreams-sync:juju-info' + - 'octavia-diskimage-retrofit:juju-info' + + - - 'keystone-mysql-router:shared-db' + - 'keystone:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance-mysql-router:shared-db' + - 'glance:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'glance:identity-service' + + - - 'keystone:identity-service' + - 'glance-simplestreams-sync:identity-service' + + - - 'keystone:identity-credentials' + - 'octavia-diskimage-retrofit:identity-credentials' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml new file mode 100644 index 0000000..c10e497 --- /dev/null +++ b/src/tests/bundles/focal-xena.yaml @@ -0,0 +1,122 @@ +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': + +applications: + + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + source: ppa:simplestreams-dev/trunk + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', + max: 1, + item_filters: [ + 'release~(xenial|bionic|focal)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)' + ] + }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" + to: + - '5' + + octavia-diskimage-retrofit: + charm: ../../../octavia-diskimage-retrofit + options: + retrofit-series: focal + +relations: + + - - 'glance-simplestreams-sync:juju-info' + - 'octavia-diskimage-retrofit:juju-info' + + - - 'keystone-mysql-router:shared-db' + - 'keystone:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance-mysql-router:shared-db' + - 'glance:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'glance:identity-service' + + - - 'keystone:identity-service' + - 'glance-simplestreams-sync:identity-service' + + - - 'keystone:identity-credentials' + - 'octavia-diskimage-retrofit:identity-credentials' diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 0000000..495c3d5 --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,122 @@ +variables: + openstack-origin: &openstack-origin distro + +series: hirsute + +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': + +applications: + + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + source: ppa:simplestreams-dev/trunk + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', + max: 1, + item_filters: [ + 'release~(xenial|bionic|focal)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)' + ] + }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" + to: + - '5' + + octavia-diskimage-retrofit: + charm: ../../../octavia-diskimage-retrofit + options: + retrofit-series: focal + +relations: + + - - 'glance-simplestreams-sync:juju-info' + - 'octavia-diskimage-retrofit:juju-info' + + - - 'keystone-mysql-router:shared-db' + - 'keystone:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance-mysql-router:shared-db' + - 'glance:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'glance:identity-service' + + - - 'keystone:identity-service' + - 'glance-simplestreams-sync:identity-service' + + - - 'keystone:identity-credentials' + - 'octavia-diskimage-retrofit:identity-credentials' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/impish-xena.yaml similarity index 72% rename from src/tests/bundles/groovy-victoria.yaml rename to src/tests/bundles/impish-xena.yaml index 815e952..1428d38 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: groovy +series: impish comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -65,17 +65,30 @@ applications: 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)' ] - }, - {url: 'http://cloud-images.ubuntu.com/minimal/daily/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', - max: 1, - item_filters: [ - 'release~(xenial|bionic|focal)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)' - ] }]" + # NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966 + # is fixed. + # + # mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }, + # {url: 'http://cloud-images.ubuntu.com/minimal/daily/', + # name_prefix: 'ubuntu:released', + # path: 'streams/v1/index.sjson', + # max: 1, + # item_filters: [ + # 'release~(xenial|bionic|focal)', + # 'arch~(x86_64|amd64)', + # 'ftype~(disk1.img|disk.img)' + # ] + # }]" to: - '5' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 6cb1a09..58ca71a 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,23 +1,33 @@ charm_name: octavia-diskimage-retrofit + smoke_bundles: - bionic-ussuri + gate_bundles: -- groovy-victoria - focal-victoria - focal-ussuri - bionic-ussuri - bionic-train - bionic-stein + dev_bundles: - bionic-rocky +- focal-wallaby +- focal-xena +- hirsute-wallaby +- impish-xena + target_deploy_status: glance-simplestreams-sync: workload-status: unknown workload-status-message: "" + configure: - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images + tests: - zaza.openstack.charm_tests.octavia.diskimage_retrofit.tests.OctaviaDiskimageRetrofitTest + tests_options: force_deploy: - - groovy-victoria + - impish-xena 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