From 02a3d7b1fa0a9fe807b1f4cecd2dac55cf7134c1 Mon Sep 17 00:00:00 2001 From: Andriy Kokhan Date: Tue, 30 May 2023 08:42:41 +0300 Subject: [PATCH 1/2] Updated SAI-Challenger to latest main, May 30 Signed-off-by: Andriy Kokhan --- .../dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env | 2 +- dash-pipeline/dockerfiles/Dockerfile.saichallenger-client | 2 +- dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr | 2 +- test/SAI-Challenger | 2 +- 4 files changed, 4 insertions(+), 4 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 index e50b6e49d..a379a0ae3 100644 --- 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?=230515 +export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_CTAG?=230530 diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client index 79934a595..d6e52055d 100644 --- 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:230515 +FROM sonicdash.azurecr.io/dash-saichallenger-client-bldr:230530 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 index 6e5ad7959..67a1d6f19 100644 --- a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr +++ b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr @@ -1,5 +1,5 @@ # Requires or something -# sc-client:230515 +# sc-client:230530 FROM sc-client ADD tests/ /tests/ diff --git a/test/SAI-Challenger b/test/SAI-Challenger index 44458c9d0..8fe5256fe 160000 --- a/test/SAI-Challenger +++ b/test/SAI-Challenger @@ -1 +1 @@ -Subproject commit 44458c9d0f8147cf696204ad700bf46f8738180f +Subproject commit 8fe5256feadcf28742445a2f6121b7dc38ac73b4 From 3049f199a0d17af51223a81803605cf70756385a Mon Sep 17 00:00:00 2001 From: Andriy Kokhan Date: Wed, 31 May 2023 19:41:47 +0300 Subject: [PATCH 2/2] Updated pytest requirements to >=6.0.1 Signed-off-by: Andriy Kokhan --- dash-pipeline/tests/requirements.txt | 2 +- test/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dash-pipeline/tests/requirements.txt b/dash-pipeline/tests/requirements.txt index 7db3f16dd..34cd8841c 100644 --- a/dash-pipeline/tests/requirements.txt +++ b/dash-pipeline/tests/requirements.txt @@ -1,2 +1,2 @@ snappi==0.9.4 -pytest==6.0.1 +pytest>=6.0.1 diff --git a/test/requirements.txt b/test/requirements.txt index 7db3f16dd..34cd8841c 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ snappi==0.9.4 -pytest==6.0.1 +pytest>=6.0.1