From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 14 May 2020 12:19:56 +0000 (+0000)
Subject: Merge "Fix ssh cleanup issue for vuls test"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=a7364a2a37a3fdfc432463d9b5ddbf3fddd82fd6;hp=698d473074537ae738bbac8a887b7e7547113724

Merge "Fix ssh cleanup issue for vuls test"
---

diff --git a/bluval/blucon.py b/bluval/blucon.py
index 8072382..6913330 100644
--- a/bluval/blucon.py
+++ b/bluval/blucon.py
@@ -109,7 +109,7 @@ def invoke_dockers(yaml_loc, layer, blueprint_name, tag):
 @click.option('--network', '-n')
 @click.option('--tag', '-t')
 @click.option('--optional_also', '-o', is_flag=True)
-@click.option('--pull', '-p', is_flag=True)
+@click.option('--pull', '-P', is_flag=True)
 # pylint: disable=too-many-arguments
 def main(blueprint, layer, network, tag, optional_also, pull):
     """Takes blueprint name and optional layer. Validates inputs and derives
diff --git a/bluval/bluval-eliot.yaml b/bluval/bluval-eliot.yaml
new file mode 100644
index 0000000..3632777
--- /dev/null
+++ b/bluval/bluval-eliot.yaml
@@ -0,0 +1,41 @@
+---
+##############################################################################
+# Copyright (c) 2020 Huawei Tech and others.                                 #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License.                   #
+#                                                                            #
+# You may obtain a copy of the License at                                    #
+#       http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+##############################################################################
+blueprint:
+    name: eliot
+    layers:
+        - os
+        - k8s
+
+    os: &os_eliot
+        -
+            name: lynis
+            what: lynis
+            optional: "False"
+        -
+            name: vuls
+            what: vuls
+            optional: "False"
+
+    k8s: &k8s
+        -
+            name: kube-hunter
+            what: kube-hunter
+            optional: "False"
+        -
+            name: conformance
+            what: conformance
+            optional: "False"