From 800d20bf1aa293c4f3212c4692a4c693db7e1cf1 Mon Sep 17 00:00:00 2001 From: lguohan Date: Fri, 22 Mar 2019 21:02:10 -0700 Subject: [PATCH] [sonic-utilities]: fix sonic-utilities build error (#2693) * [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 --- sonic-slave/Dockerfile | 4 +++- src/sonic-utilities | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile index 728c3d40f9f5..a0eedb0937bc 100644 --- a/sonic-slave/Dockerfile +++ b/sonic-slave/Dockerfile @@ -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 diff --git a/src/sonic-utilities b/src/sonic-utilities index d51435eb9a69..1b734f1e45f2 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit d51435eb9a693e86484c4f2d66f4a7c8807fa555 +Subproject commit 1b734f1e45f2c1447a9e3c6b414cf8a9402910e0