From 68cb4c0613cd42a45e2da1d6313e094e59b2ef0f Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 5 May 2020 09:25:07 -0700
Subject: [PATCH] qa: move fsx deps into common cephfs install yaml

The double install task causes errors during unwind.

Fixes: fe3961fc36e4d0af896fe140ba2450e1556ab563
Fixes: https://tracker.ceph.com/issues/45387
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d791daa732e122c4b81ec5693eeb3971a87199cb)
---
 qa/cephfs/begin.yaml                                 | 10 ++++++++++
 .../tasks/cfuse_workunit_suites_fsx.yaml             | 12 ------------
 .../cephfs/tasks/kclient_workunit_suites_fsx.yaml    | 12 ------------
 .../basic/tasks/cfuse_workunit_suites_fsx.yaml       | 12 ------------
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin.yaml
index 0f3beb8fbd03e..b69eac9c6c442 100644
--- a/qa/cephfs/begin.yaml
+++ b/qa/cephfs/begin.yaml
@@ -16,6 +16,11 @@ tasks:
         # for xfstests-dev
         - dump
         - indent
+        # for fsx
+        - libaio-dev
+        - libtool-bin
+        - uuid-dev
+        - xfslibs-dev
         rpm:
         - bison
         - flex
@@ -30,4 +35,9 @@ tasks:
         - xfsdump
         - xfsprogs
         - xfsprogs-devel
+        # for fsx
+        - libaio-devel
+        - libtool
+        - libuuid-devel
+        - xfsprogs-devel
   - ceph:
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
index 4b45dbf921340..b16cfb17d6004 100644
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
@@ -1,16 +1,4 @@
 tasks:
-- install:
-    extra_system_packages:
-      deb:
-      - libaio-dev
-      - libtool-bin
-      - uuid-dev
-      - xfslibs-dev
-      rpm:
-      - libaio-devel
-      - libtool
-      - libuuid-devel
-      - xfsprogs-devel
 - check-counter:
     counters:
       mds:
diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
index 67e63ba2e18a3..8b2b1ab5c1414 100644
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
+++ b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
@@ -1,16 +1,4 @@
 tasks:
-- install:
-    extra_system_packages:
-      deb:
-      - libaio-dev
-      - libtool-bin
-      - uuid-dev
-      - xfslibs-dev
-      rpm:
-      - libaio-devel
-      - libtool
-      - libuuid-devel
-      - xfsprogs-devel
 - workunit:
     clients:
       all:
diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml
index 67e63ba2e18a3..8b2b1ab5c1414 100644
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml
@@ -1,16 +1,4 @@
 tasks:
-- install:
-    extra_system_packages:
-      deb:
-      - libaio-dev
-      - libtool-bin
-      - uuid-dev
-      - xfslibs-dev
-      rpm:
-      - libaio-devel
-      - libtool
-      - libuuid-devel
-      - xfsprogs-devel
 - workunit:
     clients:
       all:
-- 
2.39.5