From f0b9339e221472c8291f0ad7bfbf7651217afddd Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Fri, 24 Oct 2014 09:57:46 -0700
Subject: [PATCH] Cleaned up tests structure

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 suites/upgrade/firefly/singleton/all-x/upgrade_client/distros    | 1 -
 suites/upgrade/firefly/singleton/all-x/versions-steps/distros    | 1 -
 suites/upgrade/firefly/singleton/{all-x => }/upgrade_client/%    | 0
 suites/upgrade/firefly/singleton/{all => upgrade_client}/distros | 0
 .../{all-x => }/upgrade_client/upgrade_client_first.yaml         | 0
 .../singleton/{all-x/versions-steps => versions-steps-x}/%       | 0
 suites/upgrade/firefly/singleton/versions-steps-x/distros        | 1 +
 .../versions-steps => versions-steps-x}/versions-steps-x.yaml    | 0
 suites/upgrade/firefly/singleton/{all => versions-steps}/%       | 0
 suites/upgrade/firefly/singleton/versions-steps/distros          | 1 +
 .../singleton/{all => versions-steps}/versions-steps.yaml        | 0
 11 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 120000 suites/upgrade/firefly/singleton/all-x/upgrade_client/distros
 delete mode 120000 suites/upgrade/firefly/singleton/all-x/versions-steps/distros
 rename suites/upgrade/firefly/singleton/{all-x => }/upgrade_client/% (100%)
 rename suites/upgrade/firefly/singleton/{all => upgrade_client}/distros (100%)
 rename suites/upgrade/firefly/singleton/{all-x => }/upgrade_client/upgrade_client_first.yaml (100%)
 rename suites/upgrade/firefly/singleton/{all-x/versions-steps => versions-steps-x}/% (100%)
 create mode 120000 suites/upgrade/firefly/singleton/versions-steps-x/distros
 rename suites/upgrade/firefly/singleton/{all-x/versions-steps => versions-steps-x}/versions-steps-x.yaml (100%)
 rename suites/upgrade/firefly/singleton/{all => versions-steps}/% (100%)
 create mode 120000 suites/upgrade/firefly/singleton/versions-steps/distros
 rename suites/upgrade/firefly/singleton/{all => versions-steps}/versions-steps.yaml (100%)

diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros b/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros
deleted file mode 120000
index 7b52e04bddc97..0000000000000
--- a/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/supported/
\ No newline at end of file
diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/distros b/suites/upgrade/firefly/singleton/all-x/versions-steps/distros
deleted file mode 120000
index 7b52e04bddc97..0000000000000
--- a/suites/upgrade/firefly/singleton/all-x/versions-steps/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/supported/
\ No newline at end of file
diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/% b/suites/upgrade/firefly/singleton/upgrade_client/%
similarity index 100%
rename from suites/upgrade/firefly/singleton/all-x/upgrade_client/%
rename to suites/upgrade/firefly/singleton/upgrade_client/%
diff --git a/suites/upgrade/firefly/singleton/all/distros b/suites/upgrade/firefly/singleton/upgrade_client/distros
similarity index 100%
rename from suites/upgrade/firefly/singleton/all/distros
rename to suites/upgrade/firefly/singleton/upgrade_client/distros
diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/upgrade_client_first.yaml b/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
similarity index 100%
rename from suites/upgrade/firefly/singleton/all-x/upgrade_client/upgrade_client_first.yaml
rename to suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/% b/suites/upgrade/firefly/singleton/versions-steps-x/%
similarity index 100%
rename from suites/upgrade/firefly/singleton/all-x/versions-steps/%
rename to suites/upgrade/firefly/singleton/versions-steps-x/%
diff --git a/suites/upgrade/firefly/singleton/versions-steps-x/distros b/suites/upgrade/firefly/singleton/versions-steps-x/distros
new file mode 120000
index 0000000000000..ea78f6570e5da
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/distros
@@ -0,0 +1 @@
+../../../../../distros/supported/
\ No newline at end of file
diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/versions-steps-x.yaml b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
similarity index 100%
rename from suites/upgrade/firefly/singleton/all-x/versions-steps/versions-steps-x.yaml
rename to suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
diff --git a/suites/upgrade/firefly/singleton/all/% b/suites/upgrade/firefly/singleton/versions-steps/%
similarity index 100%
rename from suites/upgrade/firefly/singleton/all/%
rename to suites/upgrade/firefly/singleton/versions-steps/%
diff --git a/suites/upgrade/firefly/singleton/versions-steps/distros b/suites/upgrade/firefly/singleton/versions-steps/distros
new file mode 120000
index 0000000000000..ea78f6570e5da
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/versions-steps/distros
@@ -0,0 +1 @@
+../../../../../distros/supported/
\ No newline at end of file
diff --git a/suites/upgrade/firefly/singleton/all/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
similarity index 100%
rename from suites/upgrade/firefly/singleton/all/versions-steps.yaml
rename to suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
-- 
2.39.5