From c34650658fb4b2fc9ec397dec05f7d48822a8697 Mon Sep 17 00:00:00 2001
From: dyastremsky <58150256+dyastremsky@users.noreply.github.com>
Date: Mon, 11 Sep 2023 15:31:10 -0700
Subject: [PATCH] Exclude extra TRT version-compatible models from tests
 (#6294)

* Exclude compatible models from tests.

* Force model removal, in case it does not exist

Co-authored-by: Ryan McCormick <rmccormick@nvidia.com>

---------

Co-authored-by: Ryan McCormick <rmccormick@nvidia.com>
---
 qa/L0_infer_zero/test.sh      |  4 ++++
 qa/L0_nullchar_string/test.sh | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/qa/L0_infer_zero/test.sh b/qa/L0_infer_zero/test.sh
index 7f10f0dd18..02676b2f85 100755
--- a/qa/L0_infer_zero/test.sh
+++ b/qa/L0_infer_zero/test.sh
@@ -55,6 +55,10 @@ rm -fr models && mkdir models
 cp -r /data/inferenceserver/${REPO_VERSION}/qa_identity_model_repository/* models/. && \
     cp -r /data/inferenceserver/${REPO_VERSION}/qa_ensemble_model_repository/qa_identity_model_repository/* models/.
 
+# Remove version-compatible TensorRT models, as they require version-compatibility
+# mode to be turned on when starting the server.
+rm -rf models/plan_compatible*
+
 create_nop_version_dir `pwd`/models
 
 RET=0
diff --git a/qa/L0_nullchar_string/test.sh b/qa/L0_nullchar_string/test.sh
index f1c81c9aa6..bded41dc92 100755
--- a/qa/L0_nullchar_string/test.sh
+++ b/qa/L0_nullchar_string/test.sh
@@ -40,16 +40,22 @@ fi
 
 export CUDA_VISIBLE_DEVICES=0
 
+CLIENT_LOG="./client.log"
 DATADIR=/data/inferenceserver/${REPO_VERSION}/qa_identity_model_repository
+MODELS="graphdef_nobatch_zero_1_object savedmodel_nobatch_zero_1_object"
 NULLCHAR_CLIENT_PY=nullchar_string_client.py
-CLIENT_LOG="./client.log"
 
 SERVER=/opt/tritonserver/bin/tritonserver
-SERVER_ARGS="--model-repository=$DATADIR"
+SERVER_ARGS="--model-repository=models"
 SERVER_LOG="./inference_server.log"
 source ../common/util.sh
 
-rm -f $CLIENT_LOG $SERVER_LOG
+rm -f $CLIENT_LOG $SERVER_LOG models
+
+mkdir -p models
+for MODEL in $MODELS; do
+    cp -r $DATADIR/$MODEL models/.
+done
 
 run_server
 if [ "$SERVER_PID" == "0" ]; then
@@ -65,7 +71,7 @@ set +e
 # Ignore ONNX backend because even though ONNX supports string data type,
 # strings that contain null character in the middle is not allowed.
 # https://github.com/microsoft/onnxruntime/issues/2284
-for MODEL in graphdef_nobatch_zero_1_object savedmodel_nobatch_zero_1_object; do
+for MODEL in $MODELS; do
   python $NULLCHAR_CLIENT_PY -m $MODEL -v >>$CLIENT_LOG 2>&1
   if [ $? -ne 0 ]; then
       RET=1