From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 17:50:25 +0000 (-0600)
Subject: qa/suites/rgw: pin swift tests to py2/ubuntu
X-Git-Tag: v15.1.0~451^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c1dde3b2a6b9d58bf9e14272b232e79446c12c8;p=ceph.git

qa/suites/rgw: pin swift tests to py2/ubuntu

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

diff --git a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
index 569741b0e150..cd74a835f990 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
@@ -1,3 +1,6 @@
+# swift uses nosetests; pin to py2 for now
+os_type: ubuntu
+
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rgw/thrash/workload/rgw_swift.yaml b/qa/suites/rgw/thrash/workload/rgw_swift.yaml
index 45e2fc9cc308..bb3101bc6cb6 100644
--- a/qa/suites/rgw/thrash/workload/rgw_swift.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_swift.yaml
@@ -1,3 +1,6 @@
+# swift uses nosetests; pin to py2 for now
+os_type: ubuntu
+
 tasks:
 - swift:
     client.0:
diff --git a/qa/suites/smoke/basic/tasks/rgw_swift.yaml b/qa/suites/smoke/basic/tasks/rgw_swift.yaml
index 57c7226e341e..31161da6775f 100644
--- a/qa/suites/smoke/basic/tasks/rgw_swift.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_swift.yaml
@@ -1,3 +1,6 @@
+# swift uses nosetests; pin to py2 for now
+os_type: ubuntu
+
 tasks:
 - install:
 - ceph: