Merge "[docker] Standardize the location of the code"

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/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/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