Updated SAI-Challenger to latest main (#519)

* Updated SAI-Challenger to latest main Signed-off-by: Andriy Kokhan <[email protected]> * Updated SAI-C client builder dockerfile Signed-off-by: Andriy Kokhan <[email protected]> * Added dependencies required by lxml (from dpugen==0.0.5) Signed-off-by: Andriy Kokhan <[email protected]> * Install lxml dependency of dpugen==0.0.5 Signed-off-by: Andriy Kokhan <[email protected]> --------- Signed-off-by: Andriy Kokhan <[email protected]>
sonic-net · Feb 21, 2024 · 82683b1 · 82683b1
1 parent d9f55b9
commit 82683b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env b/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env
@@ -2,4 +2,4 @@
 # Changing this will cause build/publish to occur in CI actions
 export DASH_ACR_REGISTRY=sonicdash.azurecr.io
 export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_NAME=${DASH_ACR_REGISTRY}/dash-saichallenger-client-bldr
-export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_CTAG?=230601
+export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_CTAG?=240216
diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client
@@ -1,4 +1,4 @@
-FROM sonicdash.azurecr.io/dash-saichallenger-client-bldr:230601
+FROM sonicdash.azurecr.io/dash-saichallenger-client-bldr:240216
 
 ENV SAI_CHALLENGER_PATH /sai-challenger
 ENV DASH_PATH /dash

diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr
@@ -1,6 +1,6 @@
 # Requires <url of sai-challenger branch> <commit sha> or something
-# sc-client:230607
-FROM sc-client
+# sc-client:240216
+FROM sc-client:buster
 
 ADD tests/ /tests/
 
@@ -10,6 +10,10 @@ ADD SAI/SAI/test/ptf /SAI/test/ptf
 # Install PTF test framework & test-cases from SAI repo
 ADD SAI/SAI/ptf /SAI/ptf/
 
+# Install dependencies for dpugen==0.0.5
+RUN apt-get update && \
+    apt-get install -y python3-lxml
+
 # Install the python libraries
 RUN python3 -m pip install -r /tests/requirements.txt && \
     pip3 install scapy \

diff --git a/test/SAI-Challenger b/test/SAI-Challenger