marginal/multiclient: /tmp/cephtest -> $TESTDIR

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

diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
index 3561b72aafe94b15cba483efdb94c60e74b9a000..abaddc8fca16dfeeafc19c01b63e447b17e1f19d 100644 (file)
--- a/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/fsx-mpi-cfuse.yaml
@@ -4,16 +4,16 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/fsx-mpi.c
       - mpicc fsx-mpi.c -o fsx-mpi 
       - rm fsx-mpi.c
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: /tmp/cephtest/gmnt
+    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
+    workdir: $TESTDIR/gmnt
 - pexec:
     all:
-      - rm /tmp/cephtest/gmnt
-      - rm /tmp/cephtest/fsx-mpi
+      - rm $TESTDIR/gmnt
+      - rm $TESTDIR/fsx-mpi

diff --git a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml b/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
index 1c592a9c11d91dfac1b6ed3d39c7bf8abb59dc6f..dd3d8c28d1905e95cf7db8172dda627cd5a9a094 100644 (file)
--- a/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/fsx-mpi-kclient.yaml
@@ -4,16 +4,16 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/fsx-mpi.c
       - mpicc fsx-mpi.c -o fsx-mpi 
       - rm fsx-mpi.c
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
-    workdir: /tmp/cephtest/gmnt
+    exec: $TESTDIR/fsx-mpi 1MB -N 50000 -p 10000 -l 1048576
+    workdir: $TESTDIR/gmnt
 - pexec:
     all:
-      - rm /tmp/cephtest/gmnt
-      - rm /tmp/cephtest/fsx-mpi
+      - rm $TESTDIR/gmnt
+      - rm $TESTDIR/fsx-mpi

diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
index e791add5fdea4a1fce528e1ffd3cf8c16fd33acd..21d840bcb13e7cb327118512b329574621e16e1f 100644 (file)
--- a/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/ior-shared-file-cfuse.yaml
@@ -4,21 +4,21 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/ior.tbz2
       - tar xvfj ior.tbz2
       - cd ior
       - ./configure
       - make
-      - make install DESTDIR=/tmp/cephtest/binary/
-      - cd /tmp/cephtest/
+      - make install DESTDIR=$TESTDIR/binary/
+      - cd $TESTDIR/
       - rm ior.tbz2
       - rm -r ior
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o /tmp/cephtest/gmnt/ior.testfile
+    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt/ior.testfile
-      - rm -f /tmp/cephtest/gmnt
+      - rm -f $TESTDIR/gmnt/ior.testfile
+      - rm -f $TESTDIR/gmnt

diff --git a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml b/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
index 5df13da7d34e7f2fd9753278e8f5900b400be50a..12d09df9dd727c747bb908af62b0446077363389 100644 (file)
--- a/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/ior-shared-file-kclient.yaml
@@ -4,21 +4,21 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/ior.tbz2
       - tar xvfj ior.tbz2
       - cd ior
       - ./configure
       - make
-      - make install DESTDIR=/tmp/cephtest/binary/
-      - cd /tmp/cephtest/
+      - make install DESTDIR=$TESTDIR/binary/
+      - cd $TESTDIR/
       - rm ior.tbz2
       - rm -r ior
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o /tmp/cephtest/gmnt/ior.testfile
+    exec: $TESTDIR/binary/usr/local/bin/ior -e -w -r -W -b 10m -a POSIX -o $TESTDIR/gmnt/ior.testfile
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt/ior.testfile
-      - rm -f /tmp/cephtest/gmnt
+      - rm -f $TESTDIR/gmnt/ior.testfile
+      - rm -f $TESTDIR/gmnt

diff --git a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml b/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
index 93a074b5f09bd73a7116d96d74f70cf6ae303cd4..48cb3d7ab7c374b9cb089a9ce7edf8d006eec528 100644 (file)
--- a/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
+++ b/suites/marginal/multiclient/tasks/mdtest-cfuse.yaml
@@ -4,18 +4,18 @@ tasks:
 - ceph-fuse:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/mdtest-1.8.4.tgz
       - tar xvfz mdtest-1.8.4.tgz
-      - rm /tmp/cephtest/mdtest-1.8.4.tgz
+      - rm $TESTDIR/mdtest-1.8.4.tgz
       - cd mdtest-1.8.4
       - make
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/mdtest-1.8.4/mdtest -d /tmp/cephtest/gmnt -I 20 -z 5 -b 2 -R
+    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt
-      - rm -rf /tmp/cephtest/mdtest-1.8.4
-      - rm -rf /tmp/cephtest/._mdtest-1.8.4
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/mdtest-1.8.4
+      - rm -rf $TESTDIR/._mdtest-1.8.4

diff --git a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml b/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
index 729bbd1af3867e475385a6f96a0d7ebddb746a62..d18b4bde94c37803b05ce81325f29f509db70fb8 100644 (file)
--- a/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
+++ b/suites/marginal/multiclient/tasks/mdtest-kclient.yaml
@@ -4,18 +4,18 @@ tasks:
 - kclient:
 - pexec:
     clients:
-      - cd /tmp/cephtest
+      - cd $TESTDIR
       - wget http://ceph.com/qa/mdtest-1.8.4.tgz
       - tar xvfz mdtest-1.8.4.tgz
-      - rm /tmp/cephtest/mdtest-1.8.4.tgz
+      - rm $TESTDIR/mdtest-1.8.4.tgz
       - cd mdtest-1.8.4
       - make
-      - ln -s /tmp/cephtest/mnt.* /tmp/cephtest/gmnt
+      - ln -s $TESTDIR/mnt.* $TESTDIR/gmnt
 - ssh_keys:
 - mpi:
-    exec: /tmp/cephtest/mdtest-1.8.4/mdtest -d /tmp/cephtest/gmnt -I 20 -z 5 -b 2 -R
+    exec: $TESTDIR/mdtest-1.8.4/mdtest -d $TESTDIR/gmnt -I 20 -z 5 -b 2 -R
 - pexec:
     all:
-      - rm -f /tmp/cephtest/gmnt
-      - rm -rf /tmp/cephtest/mdtest-1.8.4
-      - rm -rf /tmp/cephtest/._mdtest-1.8.4
+      - rm -f $TESTDIR/gmnt
+      - rm -rf $TESTDIR/mdtest-1.8.4
+      - rm -rf $TESTDIR/._mdtest-1.8.4