From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 19 May 2020 22:28:49 +0000 (-0700)
Subject: qa: run install task only once
X-Git-Tag: v16.1.0~2281^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41b61203992ec825c70dca51fba4effd93109e2d;p=ceph.git

qa: run install task only once

Fixes: https://tracker.ceph.com/issues/45612
Fixes: 8d77d134c73d3471515f113320e9db1f0e59eb1f
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/powercycle/osd/powercycle/default.yaml b/qa/suites/powercycle/osd/powercycle/default.yaml
index a693f4b41c8f..9e0ed4769b6f 100644
--- a/qa/suites/powercycle/osd/powercycle/default.yaml
+++ b/qa/suites/powercycle/osd/powercycle/default.yaml
@@ -1,8 +1,24 @@
 tasks:
 - install:
     extra_system_packages:
-      deb: ['bison', 'flex', 'libelf-dev', 'libssl-dev']
-      rpm: ['bison', 'flex', 'elfutils-libelf-devel', 'openssl-devel']
+      deb:
+      - bison
+      - flex
+      - libelf-dev
+      - libssl-dev
+      - libaio-dev
+      - libtool-bin
+      - uuid-dev
+      - xfslibs-dev
+      rpm:
+      - bison
+      - flex
+      - elfutils-libelf-devel
+      - openssl-devel
+      - libaio-devel
+      - libtool
+      - libuuid-devel
+      - xfsprogs-devel
 - ceph:
 - thrashosds:
     chance_down: 1.0
diff --git a/qa/suites/powercycle/osd/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/powercycle/osd/tasks/cfuse_workunit_suites_fsx.yaml
index 1c2ba286b065..94031518ea5e 100644
--- a/qa/suites/powercycle/osd/tasks/cfuse_workunit_suites_fsx.yaml
+++ b/qa/suites/powercycle/osd/tasks/cfuse_workunit_suites_fsx.yaml
@@ -1,17 +1,5 @@
 tasks:
 - ceph-fuse:
-- install:
-    extra_system_packages:
-      deb:
-      - libaio-dev
-      - libtool-bin
-      - uuid-dev
-      - xfslibs-dev
-      rpm:
-      - libaio-devel
-      - libtool
-      - libuuid-devel
-      - xfsprogs-devel
 - workunit:
     timeout: 6h
     clients: