Skip to content

Commit 800d20b

Browse files
authored
[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 <[email protected]>
1 parent 4fdfb08 commit 800d20b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

sonic-slave/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ RUN apt-get update && apt-get install -y \
239239
libvirt-bin
240240

241241
# For jenkins slave
242-
RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
242+
# RUN apt-get -y install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
243243

244244
# For linux build
245245
RUN apt-get -y build-dep linux
@@ -279,6 +279,8 @@ RUN pip install pexpect==4.6.0
279279

280280
# For sonic-utilities build
281281
RUN pip install mockredispy==2.9.3
282+
RUN pip install pytest-runner==4.4
283+
RUN pip install setuptools==40.8.0
282284

283285
# Install dependencies for isc-dhcp-relay build
284286
RUN apt-get -y build-dep isc-dhcp

src/sonic-utilities

0 commit comments

Comments
 (0)