Added markers for the vllm and fixed bug for juniparser

Signed-off-by: Amit Raj <[email protected]>

Author: quic-amitraj

scripts/Jenkinsfile

@@ -41,7 +41,8 @@ pipeline {
                            mkdir -p $PWD/Non_cli_qaic &&
                            export TOKENIZERS_PARALLELISM=false &&
                            export QEFF_HOME=$PWD/Non_cli_qaic &&
-                           pytest tests -m '(not cli) and (not on_qaic)' --ignore tests/vllm -n auto --junitxml=tests/tests_log1.xml &&
+                           pytest tests -m '(not cli) and (not on_qaic) and (not vllm)' -n auto --junitxml=tests/tests_log1.xml &&
+                           junitparser merge tests/tests_log1.xml tests/tests_log.xml &&
                            deactivate"
                            '''
                        }
@@ -57,7 +58,8 @@ pipeline {
                            mkdir -p $PWD/Non_qaic &&
                            export TOKENIZERS_PARALLELISM=false &&
                            export QEFF_HOME=$PWD/Non_qaic &&
-                           pytest tests -m '(not cli) and (on_qaic) and (not qnn)' --ignore tests/vllm -n 4 --junitxml=tests/tests_log2.xml &&
+                           pytest tests -m '(not cli) and (on_qaic) and (not qnn) and (not vllm)' -n 4 --junitxml=tests/tests_log2.xml &&
+                           junitparser merge tests/tests_log2.xml tests/tests_log.xml &&
                            deactivate"
                            '''
                        }
@@ -77,7 +79,8 @@ pipeline {
                            mkdir -p $PWD/cli &&
                            export TOKENIZERS_PARALLELISM=false &&
                            export QEFF_HOME=$PWD/cli &&
-                           pytest tests -m '(cli and not qnn)' --ignore tests/vllm --junitxml=tests/tests_log3.xml &&
+                           pytest tests -m '(cli) and (not qnn) and (not vllm)' --junitxml=tests/tests_log3.xml &&
+                           junitparser merge tests/tests_log3.xml tests/tests_log.xml &&
                            deactivate"
                            '''
                        }
@@ -105,7 +108,8 @@ pipeline {
                     mkdir -p $PWD/Qnn_cli &&
                     export TOKENIZERS_PARALLELISM=false &&
                     export QEFF_HOME=$PWD/Qnn_cli &&
-                    pytest tests -m '(cli and qnn)' --ignore tests/vllm --junitxml=tests/tests_log4.xml &&
+                    pytest tests -m '(cli and qnn)' and (not vllm) --junitxml=tests/tests_log4.xml &&
+                    junitparser merge tests/tests_log4.xml tests/tests_log.xml &&
                     deactivate"
                     '''
                 }
@@ -123,8 +127,8 @@ pipeline {
                     mkdir -p $PWD/Qnn_non_cli &&
                     export TOKENIZERS_PARALLELISM=false &&
                     export QEFF_HOME=$PWD/Qnn_non_cli &&
-                    pytest tests -m '(not cli) and (qnn) and (on_qaic)' --ignore tests/vllm --junitxml=tests/tests_log5.xml &&
-                    junitparser merge tests/tests_log1.xml tests/tests_log2.xml tests/tests_log3.xml tests/tests_log4.xml tests/tests_log5.xml tests/tests_log.xml &&
+                    pytest tests -m '(not cli) and (qnn) and (on_qaic)' and (not vllm) --junitxml=tests/tests_log5.xml &&
+                    junitparser merge tests/tests_log5.xml tests/tests_log.xml &&
                     deactivate"
                     '''
                 }