Merge "UI adaptation for supporting ONAP portal SDK"

diff --git a/docker/README.rst b/docker/README.rst
index e4c4f4b..5da7288 100644 (file)
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -70,7 +70,7 @@ stored on the local server.
 .. code-block:: console
 
     docker run -ti -v /home/jenkins/k8s_access:/root/.kube/ \
-    -v /home/jenkins/k8s_results:/opt/akraino/validation/results/ \
+    -v /home/jenkins/k8s_results:/opt/akraino/results/ \
     akraino/validation:k8s-latest
 
 By default, the container will run the k8s conformance test. If you want to

diff --git a/docker/hw/Dockerfile b/docker/hardware/Dockerfile
similarity index 100%
rename from docker/hw/Dockerfile
rename to docker/hardware/Dockerfile

diff --git a/docker/hw/Makefile b/docker/hardware/Makefile
similarity index 100%
rename from docker/hw/Makefile
rename to docker/hardware/Makefile

diff --git a/docker/hw/pip-requirements.txt b/docker/hardware/pip-requirements.txt
similarity index 100%
rename from docker/hw/pip-requirements.txt
rename to docker/hardware/pip-requirements.txt

diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
index 48ebee9..5b60ed0 100644 (file)
--- a/docker/k8s/Dockerfile
+++ b/docker/k8s/Dockerfile
@@ -49,8 +49,8 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64;
     make kubectl ginkgo && \
     make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
 RUN go get -u -v github.com/heptio/sonobuoy
-RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation/repo
-RUN cat /opt/akraino/validation/repo/bluval/requirements.txt >> \
+RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
+RUN cat /opt/akraino/validation/bluval/requirements.txt >> \
     /wheels/requirements/pip-requirements.txt
 
 WORKDIR /wheels
@@ -62,12 +62,9 @@ FROM python:3.6-alpine3.9
 COPY --from=build /src/k8s.io/kubernetes/_output/bin /usr/local/bin
 COPY --from=build /go/bin/sonobuoy /bin/sonobuoy
 COPY --from=build /wheels /wheels
-COPY --from=build /opt/akraino/validation/repo /opt/akraino/validation/repo
+COPY --from=build /opt/akraino/validation/ /opt/akraino/validation/
 
 RUN pip3 install -r /wheels/requirements/pip-requirements.txt \
                  -f /wheels && \
      rm -rf /wheels && \
      rm -rf /root/.cache/pip/*
-
-# Set the default command for running the tests
-CMD python3 /opt/akraino/validation/repo/bluval/bluval.py base -l k8s

diff --git a/tests/hardware/hp_baremetal/hp_baremetal.robot b/tests/hardware/hp_baremetal/hp_baremetal.robot
index 267cdff..09c01c2 100644 (file)
--- a/tests/hardware/hp_baremetal/hp_baremetal.robot
+++ b/tests/hardware/hp_baremetal/hp_baremetal.robot
@@ -35,7 +35,7 @@ Verify cluster connectivity
          Should Contain    ${output}    3 packets transmitted, 3 packets received
     END
 
-Verify hw health status
+Verify hardware health status
     [Documentation]   HW health should be ok
     ${output}=        Run    curl ${BASE_URI} -k | python -m json.tool | grep -A4 '"System":'
     Append To File    ${LOGHWHP}  ${output}${\n}

diff --git a/tests/k8s/conformance/sonobuoy.yaml b/tests/k8s/conformance/sonobuoy.yaml
index 89d9385..a6559cb 100644 (file)
--- a/tests/k8s/conformance/sonobuoy.yaml
+++ b/tests/k8s/conformance/sonobuoy.yaml
@@ -91,7 +91,7 @@ data:
       - name: E2E_PARALLEL
         value: '1'
       command: ["/run_e2e.sh"]
-      image: gcr.io/heptio-images/kube-conformance:v1.11
+      image: akraino/validation:kube-conformance-v1.11
       imagePullPolicy: Always
       name: e2e
       volumeMounts:
@@ -116,7 +116,7 @@ data:
         value: /tmp/results
       - name: CHROOT_DIR
         value: /node
-      image: gcr.io/heptio-images/sonobuoy-plugin-systemd-logs:latest
+      image: akraino/validation:sonobuoy-plugin-systemd-logs-latest
       imagePullPolicy: Always
       name: sonobuoy-systemd-logs-config
       securityContext:

diff --git a/tests/variables.yaml b/tests/variables.yaml
index 2949440..baa1d92 100644 (file)
--- a/tests/variables.yaml
+++ b/tests/variables.yaml
@@ -32,7 +32,7 @@ home: /home/mm747b          # Public keys location
 sysinfo: PowerEdge R740xd
 bios_revision: 1.3
 
-### Input variables for bare metal hw test dell or hp
+### Input variables for bare metal hardware test dell or hp
 base_uri: https://192.168.XX.XX/redfish/v1/   # OOB Redfish link address
 ipmiuser: ipmi_user                           # ipmi user
 ipmipwrd: ipmi_pwd                            # ipmi password