From aa6681d0c42a279f99cca50bba5719665e497ea3 Mon Sep 17 00:00:00 2001 From: DANIEL STOICA Date: Fri, 26 Jun 2020 15:19:49 +0300 Subject: [PATCH] os:vuls:Update vuls version Update vuls version to v0.10.0 In vuls v0.10.0 was deprecated the '-ssh-config' vuls argument and was moved in config.toml Signed-off-by: DANIEL STOICA Change-Id: Ia4c0357ec25725a0a2602c07f83edb397c203a04 --- docker/os/Dockerfile | 2 +- tests/os/vuls/config.toml | 1 + tests/os/vuls/vuls.robot | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile index 13a9c26..c447dea 100644 --- a/docker/os/Dockerfile +++ b/docker/os/Dockerfile @@ -69,7 +69,7 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; export PATH=$PATH:/root/go/bin:/root/go/src/github.com/bin && \ mkdir -p /root/go/src/github.com/future-architect && \ cd /root/go/src/github.com/future-architect && \ - git clone https://github.com/future-architect/vuls -b v0.9.7 && \ + git clone https://github.com/future-architect/vuls -b v0.10.0 && \ cd vuls && \ make install && \ mkdir -p /root/go/src/github.com/kotakanbe && \ diff --git a/tests/os/vuls/config.toml b/tests/os/vuls/config.toml index 1329cd5..b1681c4 100644 --- a/tests/os/vuls/config.toml +++ b/tests/os/vuls/config.toml @@ -5,4 +5,5 @@ host = "HOST" port = "22" user = "USERNAME" keyPath = "/root/.ssh/id_rsa" +sshConfigPath = "/root/.ssh/config" containerType = "docker" diff --git a/tests/os/vuls/vuls.robot b/tests/os/vuls/vuls.robot index 9774be9..3118021 100644 --- a/tests/os/vuls/vuls.robot +++ b/tests/os/vuls/vuls.robot @@ -43,7 +43,7 @@ Run Vuls test Run Keyword IF '${SSH_KEYFILE}' == 'None' Create ssh_keyfile - ${rc} = Run And Return Rc vuls scan -config ${CURDIR}/config.toml -ssh-config + ${rc} = Run And Return Rc vuls scan -config ${CURDIR}/config.toml Should Be Equal As Integers ${rc} 0 Run Keyword IF '${os}' == 'ubuntu' Run vuls for ubuntu ELSE IF '${os}' == 'centos' Run vuls for centos ELSE FAIL Distro '${os}' not supported -- 2.16.6