Merge "Update conformance test to support k8s 1.16"

diff --git a/docker/os/Dockerfile b/docker/os/Dockerfile
index 291267b..61d1848 100644 (file)
--- a/docker/os/Dockerfile
+++ b/docker/os/Dockerfile
@@ -57,7 +57,7 @@ COPY --from=build /opt/akraino/validation /opt/akraino/validation
 COPY --from=build /opt/akraino/ltp.tar.gz /opt/akraino/ltp.tar.gz
 
 RUN apt-get update && apt-get -y install \
-    python3-pip && \
+    python3-pip python3.7 &&\
     pip3 install -r /wheels/requirements/pip-requirements.txt \
                  -f /wheels && \
     rm -rf /wheels && \

diff --git a/tests/hardware/bios_version/bios_version_dell.robot b/tests/hardware/bios_version/bios_version_dell.robot
index 166182c..682e596 100644 (file)
--- a/tests/hardware/bios_version/bios_version_dell.robot
+++ b/tests/hardware/bios_version/bios_version_dell.robot
@@ -28,6 +28,7 @@ Suite Teardown    Close All Connections
 #${USERNAME}       localadmin
 #${SYSINFO}        PowerEdge R740xd
 #${BIOS_REVISION}   1.3
+${SSH_KEYFILE}     /root/.ssh/id_rsa
 ${LOG}             ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
 *** Test Cases ***
@@ -60,5 +61,5 @@ Verify Block Devices
 *** Keywords ***
 Open Connection And Log In
   Open Connection       ${HOST}
-  Login With Public Key    ${USERNAME}  /root/.ssh/${USERNAME}_id_rsa
+  Login With Public Key    ${USERNAME}  ${SSH_KEYFILE}
 

diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 3f2f1eb..45965c7 100644 (file)
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -87,9 +87,9 @@ Check that k8s cluster is reachable
 
         # Make sure the pod is reachable with the local k8s client
         ${rc}  ${output}=       Run And Return Rc And Output
-                                ...  kubectl get pods --all-namespaces
+                                ...  kubectl version
         Append To File          ${LOG}  ${output}${\n}
-        Should Contain          ${output}      kube-system
+        Should Contain          ${output}      Server Version: version.Info
 
 Cleanup Sonobuoy
         ${rc}  ${output}=       Run And Return Rc And Output

diff --git a/ui/src/main/webapp/.eslintrc b/ui/src/main/webapp/.eslintrc
index 8cc24f1..37832b3 100644 (file)
--- a/ui/src/main/webapp/.eslintrc
+++ b/ui/src/main/webapp/.eslintrc
@@ -1,10 +1,10 @@
 {
   "globals": {
     "angular": writable,
-    "console": 1,
-    "confirm":1,
-    "localStorage":1,
-    "window":1,
-    "appDS2":1
+    "console": writable,
+    "confirm":writable,
+    "localStorage":writable,
+    "window":writable,
+    "appDS2":writable
   }
 }