From 2218a36b7a8258002aa456d56e8d64408b36a40f Mon Sep 17 00:00:00 2001
From: Katherine Yang <katheriney@nvidia.com>
Date: Tue, 7 Jun 2022 02:15:34 -0700
Subject: [PATCH 1/2] fix inferentia test build

---
 inferentia/qa/setup_test_enviroment_and_test.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/inferentia/qa/setup_test_enviroment_and_test.sh b/inferentia/qa/setup_test_enviroment_and_test.sh
index 7d066157..5b7efc22 100644
--- a/inferentia/qa/setup_test_enviroment_and_test.sh
+++ b/inferentia/qa/setup_test_enviroment_and_test.sh
@@ -131,11 +131,12 @@ if [ "${UPSTREAM_CONTAINER_VERSION}" = "" ]; then
     echo "found upstream container version: ${UPSTREAM_CONTAINER_VERSION} from build.py"
 fi
 
+set -e 
 # Build container with only python backend 
 cd ${TRITON_PATH}/server
 pip3 install docker
-./build.py --build-dir=/tmp/tritonbuild \
-           --cmake-dir=${TRITON_PATH}/server/build \
+./build.py -v \
+          --no-container-interactive \
            --container-version=${CONTAINER_VERSION} \
            --upstream-container-version=${UPSTREAM_CONTAINER_VERSION} \
            --enable-logging --enable-stats --enable-tracing \
@@ -149,7 +150,7 @@ pip3 install docker
            --backend=identity:${IDENTITY_BACKEND_REPO_TAG} \
            --backend=python:${PYTHON_BACKEND_REPO_TAG} \
            --repoagent=checksum:${CHECKSUM_REPOAGENT_REPO_TAG}
-docker tag tritonserver_build "${BUILD_IMAGE}"
+docker tag tritonserver_cibase "${BUILD_IMAGE}"
 docker tag tritonserver "${BASE_IMAGE}"
 
 # Build docker container for SDK
@@ -170,6 +171,7 @@ docker build -t ${QA_IMAGE} \
                    --build-arg "BASE_IMAGE=${BASE_IMAGE}"   \
                    --build-arg "BUILD_IMAGE=${BUILD_IMAGE}" \
                    --build-arg "SDK_IMAGE=${SDK_IMAGE}"     .
+set +e
 
 # Run pytorch instance test
 docker stop ${CONTAINER_NAME} && docker rm ${CONTAINER_NAME}

From 3c4c67ec4d637d4e2925c5a39128360d867aaa94 Mon Sep 17 00:00:00 2001
From: Katherine Yang <katheriney@nvidia.com>
Date: Wed, 8 Jun 2022 15:11:16 -0700
Subject: [PATCH 2/2] addressed comments

---
 inferentia/qa/setup_test_enviroment_and_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inferentia/qa/setup_test_enviroment_and_test.sh b/inferentia/qa/setup_test_enviroment_and_test.sh
index 5b7efc22..a7ca2b0c 100644
--- a/inferentia/qa/setup_test_enviroment_and_test.sh
+++ b/inferentia/qa/setup_test_enviroment_and_test.sh
@@ -135,8 +135,8 @@ set -e
 # Build container with only python backend 
 cd ${TRITON_PATH}/server
 pip3 install docker
-./build.py -v \
-          --no-container-interactive \
+./build.py --verbose \
+           --no-container-interactive \
            --container-version=${CONTAINER_VERSION} \
            --upstream-container-version=${UPSTREAM_CONTAINER_VERSION} \
            --enable-logging --enable-stats --enable-tracing \