From 86af475f838adff5c44bb8eccdfba2d665975451 Mon Sep 17 00:00:00 2001 From: Andrej Kozemcak Date: Mon, 3 Jun 2019 14:44:09 +0200 Subject: [TEST] - Jenkins dependence - Update libssl for ubuntu 16.04 - Change ssh password for netopeer - Handle exception Change-Id: Ic13d96491a67496cba2b6ef698698b855ee67fd1 Signed-off-by: Andrej Kozemcak --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b3c3a3e..a0cccac 100644 --- a/Makefile +++ b/Makefile @@ -207,6 +207,11 @@ _netopeer2: _test_python: ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) @sudo -E apt-get $(APT_ARGS) -y --force-yes install $(DEB_TEST_DEPENDS) +ifeq ($(OS_VERSION_ID), 16.04) + # Need update libssh library, because netopeer ssh communication does not work with old library + @echo "deb http://archive.ubuntu.com/ubuntu/ bionic main restricted" >> /etc/apt/sources.list\ + &&apt-get update && apt-get -y install libssh-4 +endif else ifeq ($(OS_ID),centos) # compiler return me this error and I don't know hot to fix it, yet # Found Doxygen: /usr/bin/doxygen (found version "1.8.5") found components: doxygen dot @@ -269,7 +274,7 @@ ifeq ($(OS_ID),centos) endif endif -install-test-extra: _test_python _ydk +install-test-extra: _clean_dl _libssh _test_python _ydk @cd ../ && rm -rf $(BR)/downloads build-scvpp: @@ -287,7 +292,7 @@ build-plugins: make install @# NEW INSTRUCTIONS TO BUILD-PLUGINS MUST BE DECLARED ON A NEW LINE WITH '@' -test-plugins: +test-plugins: install-models @test/run_test.py --dir ./test/ build-gnmi: -- cgit 1.2.3-korg