From 347d5e7f0dd880463ab5c1864fe9c5b016a0a3c6 Mon Sep 17 00:00:00 2001
From: Rishabh Dave <ridave@redhat.com>
Date: Tue, 22 Aug 2023 15:23:05 +0530
Subject: [PATCH] qa/cephfs: fix ior project build failure

1. Re-install mpich packages.
2. Use a more recent version of ior project.
3. Log contents of binary directory for easy debugging.
4. Set "-x" for bash session so commands are also logged.

Fixes: https://tracker.ceph.com/issues/61399
Signed-off-by: Rishabh Dave <ridave@redhat.com>
---
 .../fs/multiclient/tasks/ior-shared-file.yaml  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml b/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml
index 5329fa67ff1ea..8293595e2d09a 100644
--- a/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml
+++ b/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml
@@ -2,16 +2,24 @@
 tasks:
 - pexec:
     clients:
+      - set -x
       - cd $TESTDIR
-      - wget http://download.ceph.com/qa/ior.tbz2
-      - tar xvfj ior.tbz2
-      - cd ior
+      # partially or incorrectly installed mpich will create a mess and the
+      # configure script or the build process (which is initiated using "make"
+      # command) for the ior project will fail
+      - sudo apt purge -y mpich
+      - sudo apt install -y mpich
+      - wget http://download.ceph.com/qa/ior-3.3.0.tar.bz2
+      - tar xvfj ior-3.3.0.tar.bz2
+      - cd ior-3.3.0
       - ./configure
       - make
       - make install DESTDIR=$TESTDIR/binary/
       - cd $TESTDIR/
-      - rm ior.tbz2
-      - rm -r ior
+      - sudo apt install -y tree
+      - tree binary/
+      - rm ior-3.3.0.tar.bz2
+      - rm -r ior-3.3.0
       - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-- 
2.39.5