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 <yehuda@redhat.com>

diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/+ b/qa/suites/rgw/upgrade/ragweed/0-cluster/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/openstack.yaml b/qa/suites/rgw/upgrade/ragweed/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index a0d5c20..0000000
--- a/qa/suites/rgw/upgrade/ragweed/0-cluster/openstack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-openstack:
-  - machine:
-      disk: 100 # GB
-  - volumes: # attached to each instance
-      count: 3
-      size: 30 # GB

diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml b/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml
deleted file mode 100644 (file)
index 2b61069..0000000
--- a/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes,
-   with a separate client-only node. 
-   Use xfs beneath the osds.
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-    fs: xfs
-    log-whitelist:
-    - wrongly marked me down
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-- - client.0

diff --git a/qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml b/qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml
deleted file mode 100644 (file)
index 96b496e..0000000
--- a/qa/suites/rgw/upgrade/ragweed/1-install/basever.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: install ceph/<base> latest
-tasks:
-- install:
-    branch: wip-rgw-support-ragweed
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-- print: "**** done install base branch"
-- ceph:
-- print: "**** done ceph"

diff --git a/qa/suites/rgw/upgrade/ragweed/2-workload/prepare.yaml b/qa/suites/rgw/upgrade/ragweed/2-workload/prepare.yaml
deleted file mode 100644 (file)
index 964b2f8..0000000
--- a/qa/suites/rgw/upgrade/ragweed/2-workload/prepare.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- rgw:
-  - client.0
-- ragweed:
-    client.0:
-      force-branch: ceph-master
-      rgw_server: client.0
-      stages: prepare

diff --git a/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml b/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml
deleted file mode 100644 (file)
index e7a23ca..0000000
--- a/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:
-    osd.0:
-    osd.1:
-    osd.2:
-    osd.3:
-    osd.4:
-    osd.5:
-    client.0:
-- ceph.restart:
-    daemons: [mon.a, mon.b, mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: false
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/qa/suites/rgw/upgrade/ragweed/4-workload/check.yaml b/qa/suites/rgw/upgrade/ragweed/4-workload/check.yaml
deleted file mode 100644 (file)
index 2d056bd..0000000
--- a/qa/suites/rgw/upgrade/ragweed/4-workload/check.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- rgw:
-  - client.0
-- ragweed:
-    client.0:
-      force-branch: ceph-master
-      rgw_server: client.0
-      stages: check

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..a0d5c20
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml
@@ -0,0 +1,6 @@
+openstack:
+  - machine:
+      disk: 100 # GB
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..2b61069
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml
@@ -0,0 +1,25 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client-only node. 
+   Use xfs beneath the osds.
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false
+    fs: xfs
+    log-whitelist:
+    - wrongly marked me down
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+- - client.0

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml
new file mode 100644 (file)
index 0000000..56f24b2
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: install ceph/<base> latest
+tasks:
+- install:
+    branch: kraken
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install base branch"
+- ceph:
+- print: "**** done ceph"

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml
new file mode 100644 (file)
index 0000000..964b2f8
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml
@@ -0,0 +1,8 @@
+tasks:
+- rgw:
+  - client.0
+- ragweed:
+    client.0:
+      force-branch: ceph-master
+      rgw_server: client.0
+      stages: prepare

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml
new file mode 100644 (file)
index 0000000..e7a23ca
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml
@@ -0,0 +1,24 @@
+tasks:
+- install.upgrade:
+    mon.a:
+    mon.b:
+    mon.c:
+    osd.0:
+    osd.1:
+    osd.2:
+    osd.3:
+    osd.4:
+    osd.5:
+    client.0:
+- ceph.restart:
+    daemons: [mon.a, mon.b, mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: false
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml
new file mode 100644 (file)
index 0000000..2d056bd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml
@@ -0,0 +1,8 @@
+tasks:
+- rgw:
+  - client.0
+- ragweed:
+    client.0:
+      force-branch: ceph-master
+      rgw_server: client.0
+      stages: check