Merge "[ui] Fix docker build for UI container"

diff --git a/.gitignore b/.gitignore
index fca7ab9..e83e681 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ bin/
 .project
 .idea
 *~
+pmd-bin-6.15.0*
 
 .*
 !/.gitignore

diff --git a/bluval/bluval-rec.yaml b/bluval/bluval-rec.yaml
new file mode 100644 (file)
index 0000000..4328b68
--- /dev/null
+++ b/bluval/bluval-rec.yaml
@@ -0,0 +1,36 @@
+---
+##############################################################################
+# Copyright (c) 2019 AT&T Intellectual Property.                             #
+# Copyright (c) 2019 Nokia.                                                  #
+#                                                                            #
+# 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: rec
+    layers:
+        - hardware
+        - os
+        - k8s
+    # Any hardware some basic tests
+    hardware: &hardware_dummy
+        -
+            name: hp_baremetal
+            what: hp_baremetal
+    os: &os_base
+        -
+            name: cyclictest
+            what: cyclictest
+    k8s: &k8s
+        -
+            name: conformance
+            what: conformance

diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 5fa1127..644b1ed 100644 (file)
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -36,7 +36,7 @@ Run Sonobuoy Conformance Test
         Append To File          ${LOG}  ${output}${\n}
 
         # Wait until the test finishes execution
-        Run                     until sonobuoy status | grep "Sonobuoy has completed"; do sleep 120; done
+        Run                     while sonobuoy status | grep "Sonobuoy is still running"; do sleep 120; done
         Append To File          ${LOG}  "Sonobuoy has completed"${\n}
 
         # Get the result and store the sonobuoy logs