Merge "Add a new variable Robot loglevel"

diff --git a/INFO.yaml b/INFO.yaml
index 96eb18b..e14f346 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -34,16 +34,6 @@ repositories:
     - validation
 committers:
     - <<: *akraino_validation_ptl
-    - name: 'Cristina Pauna'
-      email: 'cristina.pauna@enea.com'
-      company: 'enea'
-      id: 'cristinapauna'
-      timezone: 'Europe/Bucharest'
-    - name: 'Juha Kosonen'
-      email: 'juha.kosonen@nokia.com'
-      company: 'nokia'
-      id: 'jukosone'
-      timezone: 'Europe/Helsinki'
     - name: 'Andrew Wilkinson'
       email: 'arkwilkinson@gmail.com'
       company: 'gmail'

diff --git a/bluval/blucon.py b/bluval/blucon.py
index 6913330..804bf63 100644 (file)
--- a/bluval/blucon.py
+++ b/bluval/blucon.py
@@ -74,7 +74,7 @@ def invoke_docker(bluprint, layer, tag):
     if _PULL:
         pull_docker(layer, tag)
     volume_list = get_volumes('common') + get_volumes(layer)
-    cmd = ("docker run --rm" + volume_list + _SUBNET +
+    cmd = ("docker run --rm --net=host" + volume_list + _SUBNET +
            " akraino/validation:{0}-{3}"
            " /bin/sh -c"
            " 'cd /opt/akraino/validation "

diff --git a/bluval/bluval-rec.yaml b/bluval/bluval-rec.yaml
index 07df9da..0f66df0 100644 (file)
--- a/bluval/bluval-rec.yaml
+++ b/bluval/bluval-rec.yaml
@@ -27,10 +27,13 @@ blueprint:
         -
             name: hp_baremetal
             what: hp_baremetal
+            optional: "True"
+
     os: &os_rec
         -
             name: ltp
             what: ltp
+            optional: "True"
         -
             name: cyclictest
             what: cyclictest
@@ -38,16 +41,23 @@ blueprint:
         -
             name: lynis
             what: lynis
-            optional: "True"
+            optional: "False"
+        -
+            name: vuls
+            what: vuls
+            optional: "False"
 
     docker: &docker_base
         -
             name: docker_bench
             what: docker_bench
+            optional: "True"
+
     k8s: &k8s
         -
             name: conformance
             what: conformance
+            optional: "False"
         -
             name: etcd_ha
             what: etcd_ha
@@ -55,4 +65,4 @@ blueprint:
         -
             name: kube-hunter
             what: kube-hunter
-            optional: "True"
+            optional: "False"

diff --git a/tests/os/vuls/vuls.robot b/tests/os/vuls/vuls.robot
index 0847322..01ae1c4 100644 (file)
--- a/tests/os/vuls/vuls.robot
+++ b/tests/os/vuls/vuls.robot
@@ -82,6 +82,8 @@ Cleanup ssh
     ${rc} =  Run And Return Rc  ssh '${USERNAME}'@'${HOST}' "sed -i 's#${idssh}##' ~/.ssh/authorized_keys"
     Should Be Equal As Integers  ${rc}  0
 
+# Loglevel can be TRACE, DEBUG, INFO, WARN and NONE (no logging). Default is INFO
 Open Connection And Log In
+    Set Default Configuration loglevel=INFO
     Open Connection  ${HOST}
     Run Keyword IF  '${SSH_KEYFILE}' != 'None'  Login With Public Key  ${USERNAME}  ${SSH_KEYFILE}  ELSE IF  '${PASSWORD}' != 'None'  Login  ${USERNAME}  ${PASSWORD}  ELSE  FAIL