From f414dbdf0a002e075ef11be798e873f962c51199 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Mon, 24 Oct 2022 14:44:13 -0300
Subject: [PATCH] Update testing bundles.

- Drop extra-repositories from jammy-zed bundle. The repository
  ppa:openstack-charmers/swtpm is only needed when running on Focal,
  the Ubuntu Archive >= Jammy contains the needed packages.
- Drop 'source' config key from rabbitmq-server and
  mysql-innodb-cluster. The infrastructure support charm are sourced
  from 'distro' and they don't need to configure an UCA source.

Change-Id: Ia60e46b8b2d35034767a2932176ec799c2e086bf
Closes-Bug: #1994055
---
 tests/bundles/jammy-yoga.yaml  | 4 ----
 tests/bundles/jammy-zed.yaml   | 5 -----
 tests/bundles/kinetic-zed.yaml | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml
index 222c9503..f0074385 100644
--- a/tests/bundles/jammy-yoga.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@@ -61,8 +61,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -121,8 +119,6 @@ applications:
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
-    options:
-      source: *openstack-origin
     to:
       - '3'
     channel: latest/edge
diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-zed.yaml
index fd80a6df..39eb53b1 100644
--- a/tests/bundles/jammy-zed.yaml
+++ b/tests/bundles/jammy-zed.yaml
@@ -61,8 +61,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -121,8 +119,6 @@ applications:
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
-    options:
-      source: *openstack-origin
     to:
       - '3'
     channel: latest/edge
@@ -207,7 +203,6 @@ applications:
       ec-profile-m: 2
       libvirt-image-backend: rbd
       enable-vtpm: True
-      extra-repositories: ppa:openstack-charmers/swtpm
     to:
       - '10'
 
diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml
index 7aa6f41a..d3059b60 100644
--- a/tests/bundles/kinetic-zed.yaml
+++ b/tests/bundles/kinetic-zed.yaml
@@ -61,8 +61,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -121,8 +119,6 @@ applications:
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
-    options:
-      source: *openstack-origin
     to:
       - '3'
     channel: latest/edge