From deb8c05dd2bfbe3e91971b11533468c8adaf1d06 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 29 Apr 2020 18:58:22 +0100 Subject: [PATCH] Fix up the test-paths to be more obvious There's "magic" in the zaza package that converts charm names to paths for the charm under test. However, it is poorly understood, and most charms use the relative path. This patchset does that. Overlays complicate that picture, but this charm doesn't use overlays. Change-Id: Ic558c952359a5e5f60125452433d7b0588d0a1c4 --- 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/eoan-train.yaml | 2 +- tests/bundles/focal-ussuri.yaml | 2 +- tests/bundles/trusty-mitaka.yaml | 2 +- tests/bundles/xenial-mitaka.yaml | 2 +- tests/bundles/xenial-ocata.yaml | 2 +- tests/bundles/xenial-pike.yaml | 2 +- tests/bundles/xenial-queens.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 05be7b11..74c8cc3d 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -1,7 +1,7 @@ series: bionic applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd series: bionic num_units: 3 storage: diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index f1385175..8c1a02ca 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -1,7 +1,7 @@ series: bionic applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: bionic storage: diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index bf822df5..a226ba05 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -1,7 +1,7 @@ series: bionic applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: bionic storage: diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 1b270900..34636498 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -1,7 +1,7 @@ series: bionic applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: bionic storage: diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index b82bc2e5..647de631 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -1,7 +1,7 @@ series: bionic applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: bionic storage: diff --git a/tests/bundles/eoan-train.yaml b/tests/bundles/eoan-train.yaml index 8539256c..4aab9457 100644 --- a/tests/bundles/eoan-train.yaml +++ b/tests/bundles/eoan-train.yaml @@ -1,7 +1,7 @@ series: eoan applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: eoan storage: diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 78e4e7de..ace547bf 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -50,7 +50,7 @@ applications: - '2' ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 8e4b598f..f2d53bec 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -1,7 +1,7 @@ series: trusty applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: trusty storage: diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 37760454..845fb18b 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -1,7 +1,7 @@ series: xenial applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: xenial storage: diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index 90676783..0985a425 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -1,7 +1,7 @@ series: xenial applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: xenial storage: diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 7a5b49cc..0c089bb1 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -1,7 +1,7 @@ series: xenial applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: xenial storage: diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index dcc63ced..ba4f5b72 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -1,7 +1,7 @@ series: xenial applications: ceph-osd: - charm: ceph-osd + charm: ../../../ceph-osd num_units: 3 series: xenial storage: