From 5d19a1fab336857ff82f7809a14182267b860d8f Mon Sep 17 00:00:00 2001
From: Andy Wu <andy.wu@canonical.com>
Date: Fri, 22 Oct 2021 16:03:11 +0000
Subject: [PATCH] Fix keystone charm path setting in test bundles

Set keystone charm path in test/bundle/*.yaml to "../../"

Closes-Bug: #1947793

Change-Id: I4d32c78ddf83f6deb86c5b84d359929d23b94ba5
---
 tests/bundles/bionic-queens.yaml   | 2 +-
 tests/bundles/bionic-rocky.yaml    | 2 +-
 tests/bundles/bionic-stein.yaml    | 2 +-
 tests/bundles/bionic-train.yaml    | 2 +-
 tests/bundles/bionic-ussuri.yaml   | 2 +-
 tests/bundles/focal-ussuri.yaml    | 2 +-
 tests/bundles/focal-victoria.yaml  | 2 +-
 tests/bundles/focal-wallaby.yaml   | 2 +-
 tests/bundles/focal-xena.yaml      | 2 +-
 tests/bundles/hirsute-wallaby.yaml | 2 +-
 tests/bundles/impish-xena.yaml     | 2 +-
 tests/bundles/jammy-yoga.yaml      | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
index 91807708..ca82c314 100644
--- a/tests/bundles/bionic-queens.yaml
+++ b/tests/bundles/bionic-queens.yaml
@@ -23,7 +23,7 @@ applications:
     - '0'
   keystone:
     series: bionic
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       token-provider: 'fernet'
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
index 019872c5..73f2908f 100644
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@@ -23,7 +23,7 @@ applications:
     - '0'
   keystone:
     series: bionic
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: cloud:bionic-rocky
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
index d9f86dc1..7d7d780e 100644
--- a/tests/bundles/bionic-stein.yaml
+++ b/tests/bundles/bionic-stein.yaml
@@ -23,7 +23,7 @@ applications:
     - '0'
   keystone:
     series: bionic
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: cloud:bionic-stein
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index d4cdb1e4..535cf8f0 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -23,7 +23,7 @@ applications:
     - '0'
   keystone:
     series: bionic
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: cloud:bionic-train
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
index 5cbf3df1..c057ac7b 100644
--- a/tests/bundles/bionic-ussuri.yaml
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -22,7 +22,7 @@ applications:
     to:
     - '0'
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: cloud:bionic-ussuri
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 7c94373b..f77afb2b 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
index 1122baa9..6e662516 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
index 602834c0..672928a5 100644
--- a/tests/bundles/focal-wallaby.yaml
+++ b/tests/bundles/focal-wallaby.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml
index 0cbb8f18..f8061c64 100644
--- a/tests/bundles/focal-xena.yaml
+++ b/tests/bundles/focal-xena.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml
index 862bd9c7..32a2a74c 100644
--- a/tests/bundles/hirsute-wallaby.yaml
+++ b/tests/bundles/hirsute-wallaby.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml
index 48c78684..fba77d51 100644
--- a/tests/bundles/impish-xena.yaml
+++ b/tests/bundles/impish-xena.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml
index d1d2955c..e0522fc1 100644
--- a/tests/bundles/jammy-yoga.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@@ -35,7 +35,7 @@ applications:
       - '2'
 
   keystone:
-    charm: ../../../keystone
+    charm: ../../
     num_units: 3
     options:
       openstack-origin: *openstack-origin