qa/suites/rgw: disable valgrind for tests that require py2/ubuntu

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ea21829ae728354b759f117e9af8a20eb8213687)

Conflicts:
	qa/suites/rgw/website/overrides.yaml
	qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/.qa: trivial resolution

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index 22b292f8d774f6bea5760177e7726f094137b253..3247f241619bb30b6631ad6f61c29f5b8c7d63ac 100644 (file)
--- a/qa/suites/rgw/multisite/tasks/test_multi.yaml
+++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml
@@ -1,5 +1,7 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
+#os_type: centos
+# ubuntu and no valgrind until we migrate test to py3
+os_type: ubuntu
 
 tasks:
 - install:
@@ -8,16 +10,16 @@ tasks:
 - rgw:
     c1.client.0:
       port: 8000
-      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
     c1.client.1:
       port: 8001
-      valgrind: [--tool=memcheck, --max-threads=1024]
+#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.0:
       port: 8000
-      valgrind: [--tool=memcheck, --max-threads=1024]
+#      valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.1:
       port: 8001
-      valgrind: [--tool=memcheck, --max-threads=1024]
+#      valgrind: [--tool=memcheck, --max-threads=1024]
 - rgw-multisite:
 - rgw-multisite-tests:
     config:

diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml
index 99489951b4a9bca80796f424522716fa346f3053..d6686ef2a21225afeee6fc3224c2dcb1d29f06b0 100644 (file)
--- a/qa/suites/rgw/multisite/valgrind.yaml
+++ b/qa/suites/rgw/multisite/valgrind.yaml
@@ -1,10 +1,12 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
+#os_type: centos
+# ubuntu and no valgrind until we migrate test to py3
+os_type: ubuntu
 
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
+#      flavor: notcmalloc
   ceph:
     conf:
       global:
@@ -13,7 +15,7 @@ overrides:
         mon osd crush smoke test: false
       osd:
         osd fast shutdown: false
-    valgrind:
-      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-      osd: [--tool=memcheck]
-      mds: [--tool=memcheck]
+#    valgrind:
+#      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
+#      osd: [--tool=memcheck]
+#      mds: [--tool=memcheck]

diff --git a/qa/suites/rgw/tempest/distro/.qa b/qa/suites/rgw/tempest/distro/.qa
deleted file mode 120000 (symlink)
index a23f7e0..0000000
--- a/qa/suites/rgw/tempest/distro/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/tempest/distro/supported-random-distro$ b/qa/suites/rgw/tempest/distro/supported-random-distro$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/rgw/tempest/distro/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rgw/tempest/distro/valgrind.yaml b/qa/suites/rgw/tempest/distro/valgrind.yaml
deleted file mode 100644 (file)
index b66021b..0000000
--- a/qa/suites/rgw/tempest/distro/valgrind.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-os_type: centos
-overrides:
-  rgw:
-    client.0:
-      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214

diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index f0d9070cad8f811af7700e4412311bf521d220f1..ad2de4858b561d994c2e0d8489eaf9d382bfb3f1 100644 (file)
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -1,3 +1,6 @@
+# ubuntu for py2 until we move to py3
+os_type: ubuntu
+
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
 tasks:
 - install:

diff --git a/qa/suites/rgw/tempest/ubuntu_latest.yaml b/qa/suites/rgw/tempest/ubuntu_latest.yaml
new file mode 120000 (symlink)
index 0000000..3a09f9a
--- /dev/null
+++ b/qa/suites/rgw/tempest/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml
index d623bbb3493f57106ec32adf869a9c6152d20189..f1955a384f50e3857ca416e884e1c4b8ec3c84e3 100644 (file)
--- a/qa/suites/rgw/verify/tasks/0-install.yaml
+++ b/qa/suites/rgw/verify/tasks/0-install.yaml
@@ -1,14 +1,16 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
+#os_type: centos
+# ubuntu and no valgrind until we migrate test to py3
+os_type: ubuntu
 
 tasks:
 - install:
-    flavor: notcmalloc
+#    flavor: notcmalloc
 - ceph:
 - openssl_keys:
 - rgw:
     client.0:
-      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+#      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
 
 overrides:
   ceph:

diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
index dcb1c1ac318e2f3b716ab4743ce2226366b88f56..4110d899d9a383cd30ff2ad89af227ff92a9e2f9 100644 (file)
--- a/qa/suites/rgw/verify/tasks/swift.yaml
+++ b/qa/suites/rgw/verify/tasks/swift.yaml
@@ -1,3 +1,6 @@
+# py2 for swift until we move to py3
+os_type: ubuntu
+
 tasks:
 - swift:
     client.0:

diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml
index 442bba879fa5a63eb6f944de2757625563ce8963..bb71c7714a30e8361aed80b18e74bcbcb03b19be 100644 (file)
--- a/qa/suites/rgw/verify/validater/valgrind.yaml
+++ b/qa/suites/rgw/verify/validater/valgrind.yaml
@@ -1,10 +1,12 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
+#os_type: centos
+# ubuntu and no valgrind until we migrate test to py3
+os_type: ubuntu
 
 overrides:
   install:
     ceph:
-      flavor: notcmalloc
+#      flavor: notcmalloc
       #debuginfo: true
   ceph:
     conf:
@@ -14,9 +16,9 @@ overrides:
         mon osd crush smoke test: false
       osd:
         osd fast shutdown: false
-    valgrind:
-      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-      osd: [--tool=memcheck]
-      mds: [--tool=memcheck]
-# https://tracker.ceph.com/issues/38621
-#      mgr: [--tool=memcheck]
+#    valgrind:
+#      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
+#      osd: [--tool=memcheck]
+#      mds: [--tool=memcheck]
+## https://tracker.ceph.com/issues/38621
+##      mgr: [--tool=memcheck]