From 2d230840928eeff7eda659b7c82a5c12939558ca Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 3 Jul 2017 11:41:01 -0700 Subject: [PATCH] qa/rgw: ragweed: change base branch for upgrade testing Change directory structure to reflect base version of upgrade test. Also set base version to kraken. Signed-off-by: Yehuda Sadeh --- qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/+ | 0 .../rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/openstack.yaml | 0 .../rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/start.yaml | 0 .../rgw/upgrade/ragweed/{ => kraken-x}/1-install/basever.yaml | 2 +- .../rgw/upgrade/ragweed/{ => kraken-x}/2-workload/prepare.yaml | 0 .../rgw/upgrade/ragweed/{ => kraken-x}/3-upgrade/upgrade.yaml | 0 .../rgw/upgrade/ragweed/{ => kraken-x}/4-workload/check.yaml | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/+ (100%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/openstack.yaml (100%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/0-cluster/start.yaml (100%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/1-install/basever.yaml (85%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/2-workload/prepare.yaml (100%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/3-upgrade/upgrade.yaml (100%) rename qa/suites/rgw/upgrade/ragweed/{ => kraken-x}/4-workload/check.yaml (100%) diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/+ b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/0-cluster/+ rename to qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/openstack.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/0-cluster/openstack.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml diff --git a/qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml similarity index 85% rename from qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml index 96b496e83db3..56f24b20baf1 100644 --- a/qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml +++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml @@ -2,7 +2,7 @@ meta: - desc: install ceph/ latest tasks: - install: - branch: wip-rgw-support-ragweed + branch: kraken exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - print: "**** done install base branch" - ceph: diff --git a/qa/suites/rgw/upgrade/ragweed/2-workload/prepare.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/2-workload/prepare.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml diff --git a/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml diff --git a/qa/suites/rgw/upgrade/ragweed/4-workload/check.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml similarity index 100% rename from qa/suites/rgw/upgrade/ragweed/4-workload/check.yaml rename to qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml -- 2.47.3