From c718507f0c42999514e130ef3858ef125f658805 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Mon, 6 Jan 2025 17:42:14 +0800 Subject: [PATCH] Revert "Revert "Revert "[SAI PTF]Syncd-rpc and PTF docker support sai ptf v2 (#11610)""" (#158) Reverts liushilongbuaa/sonic-buildimage#157 --- .azure-pipelines/azure-pipelines-build.yml | 12 +--------- .azure-pipelines/build-template.yml | 27 ---------------------- dockers/docker-ptf-sai/Dockerfile.j2 | 5 ---- platform/broadcom/docker-saiserver-brcm.mk | 6 ----- platform/vs/docker-ptf-sai.mk | 2 +- rules/syncd.mk | 2 +- 6 files changed, 3 insertions(+), 51 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index d7f87456f891..654d0367f293 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -140,7 +140,6 @@ jobs: mv target/sonic-vs.img.gz target/sonic-vs-k8s.img.gz fi make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz - make $BUILD_OPTIONS target/docker-ptf-sai.gz if [ $(Build.Reason) != 'PullRequest' ];then gzip -kd target/sonic-vs.img.gz SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run @@ -155,16 +154,7 @@ jobs: make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi fi if [ $(docker_syncd_rpc_image) == yes ]; then - # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache - make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz - pushd ./src/sonic-sairedis/SAI - git stash - popd - if [ $(GROUP_NAME) == broadcom ]; then - make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-dnx-rpc.gz - pushd ./src/sonic-sairedis/SAI - git stash - popd + fi fi if [ $(syncd_rpc_image) == yes ]; then diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 355cfc7aaf9a..7c0315297a1d 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -92,33 +92,6 @@ jobs: fi make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/docker-ptf-sai.gz - else - if [ ${{ parameters.dbg_image }} == true ]; then - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) INSTALL_DEBUG_TOOLS=y target/sonic-${{ parameters.platform }}.bin && \ - mv target/sonic-${{ parameters.platform }}.bin target/sonic-${{ parameters.platform }}-dbg.bin - fi - if [ ${{ parameters.swi_image }} == true ]; then - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-${{ parameters.platform }}.swi - fi - if [ ${{ parameters.sync_rpc_image }} == true ]; then - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz - # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache - pushd ./src/sonic-sairedis/SAI - git stash - popd - if [ ${{ parameters.platform }} == broadcom ]; then - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz - pushd ./src/sonic-sairedis/SAI - git stash - popd - fi - if [ ${{ parameters.platform }} == barefoot ]; then - make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) SAITHRIFT_V2=y ENABLE_SYNCD_RPC=y target/docker-saiserverv2-bfn.gz - pushd ./src/sonic-sairedis/SAI - git stash - popd - fi fi make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin diff --git a/dockers/docker-ptf-sai/Dockerfile.j2 b/dockers/docker-ptf-sai/Dockerfile.j2 index b10c1868d225..30e3c720648a 100644 --- a/dockers/docker-ptf-sai/Dockerfile.j2 +++ b/dockers/docker-ptf-sai/Dockerfile.j2 @@ -42,8 +42,3 @@ RUN dpkg -r python-ptf RUN git clone https://github.com/p4lang/ptf.git \ && cd ptf \ && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt - -run echo "declare -x LANG=\"C.UTF-8\"" >> /root/.bashrc -run echo "declare -x LC_ALL=\"C.UTF-8\"" >> /root/.bashrc -run echo "declare -x PYTHONIOENCODING=\"UTF-8\"" >> /root/.bashrc -run echo "declare -x VIRTUAL_ENV=\"/root/env-python3\"" >> /root/.bashrc diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk index 6987e42faa78..03b795f05fc1 100644 --- a/platform/broadcom/docker-saiserver-brcm.mk +++ b/platform/broadcom/docker-saiserver-brcm.mk @@ -4,12 +4,6 @@ DOCKER_SAISERVER_BRCM = docker-saiserver$(SAITHRIFT_VER)-brcm.gz $(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm $(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER) -# Use syncd_init_common.sh to init hardware platform -SYNCD_INIT_COMMON_SCRIPT = syncd_init_common.sh -$(SYNCD_INIT_COMMON_SCRIPT)_PATH = $(SRC_PATH)/sonic-sairedis/syncd/scripts -SONIC_COPY_FILES += $(SYNCD_INIT_COMMON_SCRIPT) - -$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD) $(SYNCD_INIT_COMMON_SCRIPT) $(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM) SONIC_BULLSEYE_DOCKERS += $(DOCKER_SAISERVER_BRCM) diff --git a/platform/vs/docker-ptf-sai.mk b/platform/vs/docker-ptf-sai.mk index 17fce00c1fe2..d3463c5a0930 100644 --- a/platform/vs/docker-ptf-sai.mk +++ b/platform/vs/docker-ptf-sai.mk @@ -3,7 +3,7 @@ DOCKER_PTF_SAI = docker-ptf-sai.gz DOCKER_PTF_BASE = docker-ptf.gz $(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai -$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_14_1) $(PYTHON3_THRIFT_0_14_1) +$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2) $(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI) SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI) diff --git a/rules/syncd.mk b/rules/syncd.mk index 2f5cce6cebff..4c6ba71011e2 100644 --- a/rules/syncd.mk +++ b/rules/syncd.mk @@ -18,7 +18,7 @@ $(eval $(call add_derived_package,$(SYNCD),$(SYNCD_RPC))) # Inject libthrift build dependency for RPC build $(SYNCD)_DEPENDS += $(LIBSWSSCOMMON_DEV) $(LIBTHRIFT_DEV) -$(SYNCD)_DEB_BUILD_PROFILES += rpc + endif SYNCD_DBGSYM = syncd-dbgsym_1.0.0_$(CONFIGURED_ARCH).deb