matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Azp]: Fix azp on building ubuntu20.04 and sonic-mgmt (#17439)

Browse Source 
The Azp failed on ubuntu20.04 and sonic-mgmt building due to sonic-dash-api updating.

Signed-off-by: Ze Gan <ganze718@gmail.com>
This commit is contained in:
Ze Gan 2023-12-14 14:49:04 +08:00 committed by GitHub
parent 6d043a25bd
commit b21f33b8b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
View File

@ -34,7 +34,7 @@ stages:
mkdir -p /tmp/artifacts mkdir -p /tmp/artifacts
displayName: "Install dependencies" displayName: "Install dependencies"
- script: | - script: |
SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile BLDENV=bullseye SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
workingDirectory: src workingDirectory: src
displayName: "Build protobuf" displayName: "Build protobuf"
- script: | - script: |

2
dockers/docker-sonic-mgmt/Dockerfile.j2
View File

@ -224,7 +224,7 @@ RUN mkdir -p /tmp/protobuf \
# Install dash-api # Install dash-api
RUN cd /tmp \ RUN cd /tmp \
&& mkdir -p /usr/lib/python3/dist-packages/dash_api \ && mkdir -p /usr/lib/python3/dist-packages/dash_api \
&& wget https://raw.githubusercontent.com/sonic-net/sonic-buildimage/master/src/sonic-dash-api/pypkg/__init__.py -O /usr/lib/python3/dist-packages/dash_api/__init__.py \ && wget https://raw.githubusercontent.com/sonic-net/sonic-dash-api/master/misc/pypkg/dash_api/__init__.py -O /usr/lib/python3/dist-packages/dash_api/__init__.py \
&& git clone https://github.com/sonic-net/sonic-dash-api.git \ && git clone https://github.com/sonic-net/sonic-dash-api.git \
&& protoc -I=sonic-dash-api/proto --python_out=/usr/lib/python3/dist-packages/dash_api sonic-dash-api/proto/*.proto \ && protoc -I=sonic-dash-api/proto --python_out=/usr/lib/python3/dist-packages/dash_api sonic-dash-api/proto/*.proto \
&& rm -rf /tmp/sonic-dash-api && rm -rf /tmp/sonic-dash-api