From 41b578f27081f663ec64cf0f6d08389037c60754 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Sat, 27 Sep 2014 15:03:37 -0700 Subject: [PATCH] Fixing branch assumptions Signed-off-by: Yuri Weinstein --- .../dumpling-x/basic/1-install/dumpling-firefly.yaml | 7 ------- .../dumpling-x/basic/1-install/dumpling-master.yaml | 7 ------- .../1-install/{dumpling-next.yaml => dumpling-x.yaml} | 1 - .../firefly-x/basic/1-install/firefly-master.yaml | 7 ------- .../basic/1-install/{firefly-next.yaml => firefly-x.yaml} | 1 - 5 files changed, 23 deletions(-) delete mode 100644 suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml delete mode 100644 suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml rename suites/multi-version/dumpling-x/basic/1-install/{dumpling-next.yaml => dumpling-x.yaml} (82%) delete mode 100644 suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml rename suites/multi-version/firefly-x/basic/1-install/{firefly-next.yaml => firefly-x.yaml} (82%) 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 index 3a49f2f886475..0000000000000 --- 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 index 4e3b0795f0eb3..0000000000000 --- 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-x.yaml similarity index 82% rename from suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml rename to suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml index 55700e533167d..431d9fdab328c 100644 --- a/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml +++ b/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml @@ -3,5 +3,4 @@ tasks: branch: dumpling - install.upgrade: client.0: - branch: next - 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 index c7b199ba6b2d1..0000000000000 --- 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-x.yaml similarity index 82% rename from suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml rename to suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml index 572b1c41bc31c..53b15cb3c9f33 100644 --- a/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml +++ b/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml @@ -3,5 +3,4 @@ tasks: branch: firefly - install.upgrade: client.0: - branch: next - ceph: -- 2.39.5