Fixing branch assumptions

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml
deleted file mode 100644 (file)
index 3a49f2f..0000000
--- a/suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: dumpling
-- install.upgrade:
-   client.0:
-    branch: firefly
-- ceph:

diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml
deleted file mode 100644 (file)
index 4e3b079..0000000
--- a/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: dumpling
-- install.upgrade:
-   client.0:
-    branch: master
-- ceph:

diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml
deleted file mode 100644 (file)
index 55700e5..0000000
--- a/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: dumpling
-- install.upgrade:
-   client.0:
-    branch: next
-- ceph:

diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml
new file mode 100644 (file)
index 0000000..431d9fd
--- /dev/null
+++ b/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+   branch: dumpling
+- install.upgrade:
+   client.0:
+- ceph:

diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml
deleted file mode 100644 (file)
index c7b199b..0000000
--- a/suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: firefly 
-- install.upgrade:
-   client.0:
-    branch: master
-- ceph:

diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml
deleted file mode 100644 (file)
index 572b1c4..0000000
--- a/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: firefly 
-- install.upgrade:
-   client.0:
-    branch: next
-- ceph:

diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml
new file mode 100644 (file)
index 0000000..53b15cb
--- /dev/null
+++ b/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+   branch: firefly 
+- install.upgrade:
+   client.0:
+- ceph: