Merge pull request #107 from pranavprakash20/fix_cthon_ceph_job

[Cthon] Add support for cthon with ceph as backend with concurrent run support

Author: kalebskeithley

ceph/basic-ceph-cthon.sh

@@ -271,7 +271,12 @@ else
     exit 1
 fi
 # Run Cthon
-./server -a -p /nfs/cephfs -m /mnt/nfs_ceph_v4 $(hostname -I | awk '{print $1}')
+if [ "${CONCURRENT_JOBS}" == "True" ]; then
+  ./server -c 100000 /nfs/cephfs -m /mnt/nfs_ceph_v4 $(hostname -I | awk '{print $1}')
+else
+  ./server -a -p /nfs/cephfs -m /mnt/nfs_ceph_v4 $(hostname -I | awk '{print $1}')
+fi
+
 
 
 # Run CTHON for v4.1
@@ -293,7 +298,10 @@ else
     exit 1
 fi
 # Run Cthon
-./server -a -p /nfs/cephfs -m /mnt/nfs_ceph_v41 $(hostname -I | awk '{print $1}')
-
+if [ "${CONCURRENT_JOBS}" == "True" ]; then
+  ./server -c 100000 /nfs/cephfs -m /mnt/nfs_ceph_v4 $(hostname -I | awk '{print $1}')
+else
+  ./server -a -p /nfs/cephfs -m /mnt/nfs_ceph_v4 $(hostname -I | awk '{print $1}')
+fi
 exit 0
 

jobs/cthon-ceph.yml

@@ -0,0 +1,28 @@
+- job:
+    name: cthon-cephfs
+    node: cico-workspace
+    description: 'Run cthon with ceph as backend with concurrent run support on Ceph FSAL.'
+    project-type: freestyle
+    concurrent: false
+    allow-manual-triggers: true
+    disabled: true
+
+    scm:
+    - ci-tests
+
+    parameters:
+    - string:
+        default: "$WORKSPACE/ci-tests/ceph/basic-ceph-cthon.sh"
+        description: Test script to execute on the reserved machine acting as a server.
+        name: SERVER_TEST_SCRIPT
+
+    builders:
+    - get-node
+    - shell: !include-raw-verbatim: scripts/common.sh
+
+    wrappers:
+    - gerrithub_key
+    - cleanup-ws
+
+    publishers:
+    - post_build_task_return-node