Merge remote-tracking branch 'origin/develop' into oairu

2021-05-10 00:39:55 +02:00
parent c66f7da278 6d1bc204f0
commit 83ccc50f18
159 changed files with 5735 additions and 823 deletions
@@ -1478,13 +1478,13 @@ function run_test_on_vm {
        echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
    fi

-    if [ "$RUN_OPTIONS" == "none" ]
+    if [ "$RUN_OPTIONS" == "none" ] || [[ $RUN_OPTIONS =~ .*run_exec_autotests.* ]]
    then
        echo "No run on VM testing for this variant currently"
        return
    fi

-    if [[ $RUN_OPTIONS =~ .*run_exec_autotests.* ]]
+    if [[ $RUN_OPTIONS =~ .*run_XXXX_autotests.* ]]
    then
        echo "############################################################"
        echo "Running test script on VM ($VM_NAME)"