automated: linux: mmtests: reworked MMTESTS_TYPE_NAME

Variable removed from launch command as not required for MMTests. MMTESTS_TYPE_NAME renamed to TEST_NAME as it's not related to MMTests. Signed-off-by: Konstantin Belov <[email protected]>
Linaro · Oct 17, 2023 · a8d9917 · a8d9917
1 parent cfe672a
commit a8d9917
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/automated/linux/mmtests/mmtests.sh b/automated/linux/mmtests/mmtests.sh
@@ -47,9 +47,6 @@ usage() {
     MMMTests configuration file that describes how the benchmarks should be
     configured and executed.
 
-  -t <MMTESTS_TYPE_NAME>
-    MMTests test type, e.g. sysbenchcpu, iozone, sqlite, etc.
-
   -r <MMTESTS_MAX_RETRIES>
     Maximum number of retries for the single benchmark's source file download
 

diff --git a/automated/linux/mmtests/mmtests.yaml b/automated/linux/mmtests/mmtests.yaml
@@ -38,8 +38,8 @@ params:
     # looked for in TEST_DIR. Otherwise, it is cloned to $(pwd)/mmtests
     TEST_DIR: "/mmtests"
 
-    # MMTests test type, e.g. sysbenchcpu, iozone, sqlite, etc.
-    MMTESTS_TYPE_NAME: null
+    # Name of the test, which used to distinguish tests in reporting system
+    TEST_NAME: null
 
     # MMTests configuration file that describes how the benchmarks should be
     # configured and executed.
@@ -61,10 +61,9 @@ run:
             [ -n "${TEST_DIR}" ] && cmd+=" -p '${TEST_DIR}'";
             [ -n "${TEST_GIT_URL}" ] && cmd+=" -u '${TEST_GIT_URL}'";
             [ -n "${MMTESTS_CONFIG_FILE}" ] && cmd+=" -c '${MMTESTS_CONFIG_FILE}'";
-            [ -n "${MMTESTS_TYPE_NAME}" ] && cmd+=" -t '${MMTESTS_TYPE_NAME}'";
             [ -n "${MMTESTS_MAX_RETRIES}" ] && cmd+=" -r '${MMTESTS_MAX_RETRIES}'";
             [ -n "${MMTEST_ITERATIONS}" ] && cmd+=" -i '${MMTEST_ITERATIONS}'";
             eval $cmd
-        - if [ ! -z ${TEST_DIR} ]; then mv ${TEST_DIR}/../${MMTESTS_TYPE_NAME}*.json .; fi
-        - for file in ./${MMTESTS_TYPE_NAME}*.json; do ./json-to-lava.py $file >> ./output/result.txt; done
+        - if [ ! -z ${TEST_DIR} ]; then mv ${TEST_DIR}/../${TEST_NAME}*.json .; fi
+        - for file in ./${TEST_NAME}*.json; do ./json-to-lava.py $file >> ./output/result.txt; done
         - ../../utils/send-to-lava.sh ./output/result.txt