From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Tue, 27 Aug 2019 12:59:25 +0000 (+0000)
Subject: Merge "docker bench integrated with bluval"
X-Git-Tag: 2.0.0~47
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=7424e14249363201e77bdf0510550b9522fb4cf2;hp=18a580a13deb2f408b6e2c1627febb940d05cee6

Merge "docker bench integrated with bluval"
---

diff --git a/bluval/bluval-rec.yaml b/bluval/bluval-rec.yaml
index bde9b47..3c9a81b 100644
--- a/bluval/bluval-rec.yaml
+++ b/bluval/bluval-rec.yaml
@@ -20,6 +20,7 @@ blueprint:
     layers:
         - hardware
         - os
+        - docker
         - k8s
     # Any hardware some basic tests
     hardware: &hardware_dummy
@@ -30,6 +31,10 @@ blueprint:
         -
             name: cyclictest
             what: cyclictest
+    docker: &docker_base
+        -
+            name: docker_bench
+            what: docker_bench
     k8s: &k8s
         -
             name: conformance
diff --git a/tests/security/docker/docker_bench.resource b/tests/docker/docker_bench/docker_bench.resource
similarity index 100%
rename from tests/security/docker/docker_bench.resource
rename to tests/docker/docker_bench/docker_bench.resource
diff --git a/tests/security/docker/docker_bench.robot b/tests/docker/docker_bench/docker_bench.robot
similarity index 100%
rename from tests/security/docker/docker_bench.robot
rename to tests/docker/docker_bench/docker_bench.robot