From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 20:40:21 +0000 (-0600)
Subject: Revert "qa/suites/rgw: disable remaining ragweed test"
X-Git-Tag: v15.1.0~439^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce308a8d0d95a9e7f576876a268c7ee379865763;p=ceph-ci.git

Revert "qa/suites/rgw: disable remaining ragweed test"

This reverts commit 5a80fbe505e203227c4fa0de6141aaa69589d35e.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
new file mode 100644
index 00000000000..d643ab0d80e
--- /dev/null
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -0,0 +1,22 @@
+# ragweed uses nosetests, so stick to py2 for now
+os_type: ubuntu
+
+tasks:
+- install:
+- ceph:
+- rgw: [client.0]
+- ragweed:
+    client.0:
+      default-branch: ceph-master
+      rgw_server: client.0
+      stages: prepare
+- ragweed:
+    client.0:
+      default-branch: ceph-master
+      rgw_server: client.0
+      stages: check
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw lc debug interval: 10
diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml.disabled.needs.to.be.py3 b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml.disabled.needs.to.be.py3
deleted file mode 100644
index d643ab0d80e..00000000000
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml.disabled.needs.to.be.py3
+++ /dev/null
@@ -1,22 +0,0 @@
-# ragweed uses nosetests, so stick to py2 for now
-os_type: ubuntu
-
-tasks:
-- install:
-- ceph:
-- rgw: [client.0]
-- ragweed:
-    client.0:
-      default-branch: ceph-master
-      rgw_server: client.0
-      stages: prepare
-- ragweed:
-    client.0:
-      default-branch: ceph-master
-      rgw_server: client.0
-      stages: check
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw lc debug interval: 10