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

[sonic-utilities]: fix sonic-utilities build error (#2693)

Browse Source 
* [sonic-utilities]: fix sonic-utilities build error

* 1b734f1 2019-03-22 | use pytest in setuptools (#490) [lguohan]
* 7030c97 2019-03-21 | [show] show interface status added vlan and portchannels to command (#483) [Travis Van Duyn]
* a30d1a8 2019-03-21 | [warm/fast reboot] setup control plane assistant when available (#487) [Ying Xie]
* 8182dfa 2019-03-21 | [reboot script] add -h, -? options (#484) [Ying Xie]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
This commit is contained in:
lguohan 2019-03-22 21:02:10 -07:00 committed by GitHub
parent 4fdfb08b0a
commit 800d20bf1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sonic-slave/Dockerfile
View File

@ -239,7 +239,7 @@ RUN apt-get update && apt-get install -y \
libvirt-bin
# For jenkins slave
RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
# RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
# For linux build
RUN apt-get -y build-dep linux
@ -279,6 +279,8 @@ RUN pip install pexpect==4.6.0
# For sonic-utilities build
RUN pip install mockredispy==2.9.3
RUN pip install pytest-runner==4.4
RUN pip install setuptools==40.8.0
# Install dependencies for isc-dhcp-relay build
RUN apt-get -y build-dep isc-dhcp

2
src/sonic-utilities

@ -1 +1 @@
Subproject commit d51435eb9a693e86484c4f2d66f4a7c8807fa555
Subproject commit 1b734f1e45f2c1447a9e3c6b414cf8a9402910e0