From 4378e11c6753610690b9eb01e195d066ca3ae614 Mon Sep 17 00:00:00 2001
From: Francesco Petrini <francescogpetrini@gmail.com>
Date: Wed, 13 Nov 2024 18:24:01 -0800
Subject: [PATCH] test: RHEL Filesystem Tests (#7788)

---
 qa/L0_storage_S3/test.sh    | 16 +++++++++-------
 qa/L0_storage_azure/test.sh | 11 ++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/qa/L0_storage_S3/test.sh b/qa/L0_storage_S3/test.sh
index f16dc81e83..9f2b67cef4 100755
--- a/qa/L0_storage_S3/test.sh
+++ b/qa/L0_storage_S3/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,6 +45,7 @@ CLIENT_LOG_BASE="./client"
 INFER_TEST="../common/infer_test.py"
 EXPECTED_NUM_TESTS="3"
 TEST_RESULT_FILE='test_results.txt'
+BACKENDS=${BACKENDS:="graphdef savedmodel onnx libtorch plan"}
 
 # S3 credentials are necessary for this test. Pass via ENV variables
 aws configure set default.region $AWS_DEFAULT_REGION && \
@@ -164,15 +165,16 @@ for ENV_VAR in "env" "env_dummy" "config"; do
 
         # Now start model tests
 
-        for FW in graphdef savedmodel onnx libtorch plan; do
+        for FW in ${BACKENDS}; do
             cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/${FW}_float32_float32_float32/ models/
+            # Copy models with string inputs and remove nobatch (bs=1) models. Model does not exist for plan backend.
+            if [[ ${FW} != "plan" ]]; then
+                cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/${FW}*_object_object_object/ models/
+                rm -rf models/*nobatch*
+            fi
         done
 
-        # Copy models with string inputs and remove nobatch (bs=1) models
-        cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/*_object_object_object/ models/
-        rm -rf models/*nobatch*
-
-        for FW in graphdef savedmodel onnx libtorch plan; do
+        for FW in ${BACKENDS}; do
             for MC in `ls models/${FW}*/config.pbtxt`; do
                 echo "instance_group [ { kind: ${KIND} }]" >> $MC
             done
diff --git a/qa/L0_storage_azure/test.sh b/qa/L0_storage_azure/test.sh
index 15f9c78bcc..b5932fa322 100755
--- a/qa/L0_storage_azure/test.sh
+++ b/qa/L0_storage_azure/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2020-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -105,11 +105,12 @@ function setup_model_repo() {
     rm -rf models && mkdir -p models
     for FW in $BACKENDS; do
         cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/${FW}_float32_float32_float32 models/
+        # Copy models with string inputs and remove nobatch (bs=1) models. Model does not exist for plan backend.
+        if [[ ${FW} != "plan" ]]; then
+            cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/${FW}*_object_object_object/ models/
+            rm -rf models/*nobatch*
+        fi
     done
-
-    # Copy models with string inputs and remove nobatch (bs=1) models
-    cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/*_object_object_object models/
-    rm -rf models/*nobatch*
 }
 
 setup_model_repo