Merge pull request #86 from schrht/devel

Support selecting the platform specific config.
virt-s1 · Aug 5, 2021 · b5bc32c · b5bc32c
2 parents bace19f + 85c3b67
commit b5bc32c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/data_process/templates/generate_testrun_results-fio.yaml b/data_process/templates/generate_testrun_results-fio.yaml
@@ -35,4 +35,4 @@ testrun_results_generator:
       factor: 0.000001
       round: 3
     - name: Path
-      source: auto
+      source: auto
diff --git a/jupyter/templates/introduction_kvm_fio.md b/jupyter/templates/introduction_kvm_fio.md
@@ -0,0 +1 @@
+introduction_default.md
diff --git a/jupyter/templates/introduction_kvm_uperf.md b/jupyter/templates/introduction_kvm_uperf.md
@@ -0,0 +1 @@
+introduction_default.md
diff --git a/jupyter/templates/introduction_qemu_fio.md b/jupyter/templates/introduction_qemu_fio.md
@@ -0,0 +1 @@
+introduction_default.md
diff --git a/jupyter/templates/introduction_qemu_uperf.md b/jupyter/templates/introduction_qemu_uperf.md
@@ -0,0 +1 @@
+introduction_default.md
diff --git a/utils/compare_testruns.sh b/utils/compare_testruns.sh
@@ -94,18 +94,24 @@ else
     testrun_type=$testtype
 fi
 
-# Get ProjectName
-project_name=$(echo $testid | cut -d _ -f 2 | tr "[:upper:]" "[:lower:]")
+# Get platform
+platform=$(echo $testid | cut -d_ -f2 | tr [:upper:] [:lower:])
 
 # Set environment
 workspace=$(get_newpath $basepath/reports)
 compareid=$(basename $workspace)
 mkdir -p $workspace || exit 1
 
 # Collect config and data
-gtr_yaml=$templates/generate_testrun_results-${testrun_type}.yaml
-g2b_yaml=$templates/generate_2way_benchmark-${testrun_type}.yaml
-g2m_yaml=$templates/generate_2way_metadata-${testrun_type}.yaml
+gtr_yaml=$templates/generate_testrun_results-${testrun_type}-${platform}.yaml
+[ ! -f $gtr_yaml ] && gtr_yaml=$templates/generate_testrun_results-${testrun_type}.yaml
+echo "DEBUG: Use config file $gtr_yaml"
+g2b_yaml=$templates/generate_2way_benchmark-${testrun_type}-${platform}.yaml
+[ ! -f $g2b_yaml ] && g2b_yaml=$templates/generate_2way_benchmark-${testrun_type}.yaml
+echo "DEBUG: Use config file $g2b_yaml"
+g2m_yaml=$templates/generate_2way_metadata-${testrun_type}-${platform}.yaml
+[ ! -f $g2m_yaml ] && g2m_yaml=$templates/generate_2way_metadata-${testrun_type}.yaml
+echo "DEBUG: Use config file $g2m_yaml"
 
 if [ -f $gtr_yaml ]; then
     cp $gtr_yaml $workspace/base.generate_testrun_results.yaml

diff --git a/utils/process_testrun.sh b/utils/process_testrun.sh
@@ -86,8 +86,9 @@ if [ ! -e $basepath/testruns/$testrun ]; then
     exit 1
 fi
 
-# Get TestRunType
+# Get TestRunType and Platform
 testrun_type=${testrun%%_*}
+platform=$(echo $testrun | cut -d_ -f2 | tr [:upper:] [:lower:])
 
 # Set environment
 cd $basepath/testruns/$testrun
@@ -119,8 +120,12 @@ if [ "$update_db" = "1" ]; then
     [ "$testrun_type" = "fio" ] && flag="--storage"
     [ "$testrun_type" = "uperf" ] && flag="--network"
 
+    cfg_file=$templates/generate_testrun_results-${testrun_type}-dbloader-${platform}.yaml
+    [ ! -f $cfg_file ] && cfg_file=$templates/generate_testrun_results-${testrun_type}-dbloader.yaml
+    echo "DEBUG: Use config file $cfg_file"
+
     generate_testrun_results.py \
-        --config $templates/generate_testrun_results-${testrun_type}-dbloader.yaml \
+        --config $cfg_file \
         --output $csv_file &&
         cp $db $db.writebackup_$(date +%Y%m%d_%H%M%S) &&
         flask_load_db.py --db_file $db --delete $testrun $flag &&
@@ -131,4 +136,3 @@ fi
 wait
 
 exit 0
-