Update the charmcraft.yaml for xena (no 22.04 base)

- Build on 20.04 amd64
- Run on 20.04 amd64, s390x, ppc64el, arm64
- Pin tempest for python<3.8

Change-Id: I121d4753703ab4ec936df246fa114572faa95d38
This commit is contained in:
Alex Kavanagh 2022-05-16 18:49:59 +01:00
parent dfe0da3601
commit f3707dc330
4 changed files with 15 additions and 16 deletions

View File

@ -27,9 +27,7 @@ bases:
channel: "20.04" channel: "20.04"
architectures: architectures:
- amd64 - amd64
- s390x
- ppc64el
- arm64
run-on: run-on:
- name: ubuntu - name: ubuntu
channel: "20.04" channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -42,7 +42,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/xena#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/xena#egg=zaza.openstack git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/xena#egg=zaza.openstack
# Needed for charm-glance: # Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
tempest<31.0.0;python_version<'3.8'
tempest<24.0.0;python_version<'3.6' tempest<24.0.0;python_version<'3.6'
croniter # needed for charm-rabbitmq-server unit tests croniter # needed for charm-rabbitmq-server unit tests

View File

@ -38,19 +38,19 @@ applications:
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
keystone-mysql-router: keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
glance-mysql-router: glance-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
neutron-api-mysql-router: neutron-api-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
placement-mysql-router: placement-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
@ -61,7 +61,7 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: 8.0.19/edge channel: 8.0/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd

View File

@ -38,19 +38,19 @@ applications:
nova-cloud-controller-mysql-router: nova-cloud-controller-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
keystone-mysql-router: keystone-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
glance-mysql-router: glance-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
neutron-api-mysql-router: neutron-api-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
placement-mysql-router: placement-mysql-router:
charm: ch:mysql-router charm: ch:mysql-router
channel: 8.0.19/edge channel: 8.0/edge
mysql-innodb-cluster: mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster charm: ch:mysql-innodb-cluster
@ -61,7 +61,7 @@ applications:
- '0' - '0'
- '1' - '1'
- '2' - '2'
channel: 8.0.19/edge channel: 8.0/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd