Skip to content

Commit

Permalink
Update the bundles to use the stable track, edge risk for yoga
Browse files Browse the repository at this point in the history
The bundles for the yoga channel currently point to "latest/edge"
channel for all the charms.  This update points the charms to the
appropriate channel for the charm being used, either from ceph,
openstack, ovn or the misc tracks.

Remove impish bundle as EOL.

Change-Id: I332d0d90d9495254b5ee378c51090ec0533d8ce6
  • Loading branch information
ajkavanagh committed Oct 19, 2022
1 parent f2f13d3 commit 0d824c3
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 272 deletions.
3 changes: 2 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack

# 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' and python_version>='3.6'
tempest<24.0.0;python_version<'3.6'

croniter # needed for charm-rabbitmq-server unit tests
18 changes: 10 additions & 8 deletions tests/bundles/focal-xena.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local_overlay_enabled: False

variables:
openstack-origin: &openstack-origin cloud:focal-xena

Expand Down Expand Up @@ -30,22 +32,22 @@ applications:

heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge

mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
Expand All @@ -56,7 +58,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge

keystone:
charm: ch:keystone
Expand All @@ -74,7 +76,7 @@ applications:
source: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 3.9/edge

glance:
charm: ch:glance
Expand Down
18 changes: 10 additions & 8 deletions tests/bundles/focal-yoga.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local_overlay_enabled: False

variables:
openstack-origin: &openstack-origin cloud:focal-yoga

Expand Down Expand Up @@ -30,22 +32,22 @@ applications:

heat-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge

mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
Expand All @@ -56,7 +58,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge

keystone:
charm: ch:keystone
Expand All @@ -74,7 +76,7 @@ applications:
source: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 3.9/edge

glance:
charm: ch:glance
Expand Down
242 changes: 0 additions & 242 deletions tests/bundles/impish-xena.yaml

This file was deleted.

Loading

0 comments on commit 0d824c3

Please sign in to comment.