Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1416 Remove installation of vpp from containers
[csit.git]
/
resources
/
libraries
/
robot
/
shared
/
default.robot
diff --git
a/resources/libraries/robot/shared/default.robot
b/resources/libraries/robot/shared/default.robot
index
981bfa1
..
981c329
100644
(file)
--- a/
resources/libraries/robot/shared/default.robot
+++ b/
resources/libraries/robot/shared/default.robot
@@
-552,9
+552,8
@@
| | ... | default value: ${1}
| | ...
| | ... | _NOTE:_ This KW sets following test case variables:
| | ... | default value: ${1}
| | ...
| | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - tmp_volume - Docker volume mounted as /tmp directory on DUT1.
-| | ... | - dcr_uuid - UUID string (including prefix - underscore character) of
-| | ... | DUT1 /tmp volume.
+| | ... | - dcr_uuid - Parent container UUID.
+| | ... | - dcr_root - Parent container overlay.
| | ...
| | ... | *Example:*
| | ...
| | ...
| | ... | *Example:*
| | ...
@@
-567,19
+566,18
@@
| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
| | ... | engine=${container_engine} | WITH NAME | ${container_group}
| | ...
| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
| | ... | engine=${container_engine} | WITH NAME | ${container_group}
| | ...
-| | ${
tmp_volume}= | Get Environment Variable | CSIT_DUT1_VOL
-| | ${dcr_
uuid}= | Remove String | ${tmp_volume} | DUT1_VOL
-| |
Set Test Variable | ${tmp_volume
}
+| | ${
dcr_uuid}= | Get Environment Variable | CSIT_DUT1_UUID
+| | ${dcr_
root}= | Run Keyword | Get Docker Mergeddir | ${nodes['DUT1']}
+| |
... | ${dcr_uuid
}
| | Set Test Variable | ${dcr_uuid}
| | Set Test Variable | ${dcr_uuid}
+| | Set Test Variable | ${dcr_root}
| | ...
| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
| | ...
| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
-| | ... |
set_nf_cpus=${Fals
e}
+| | ... |
nested=${Tru
e}
| | Acquire all '${container_group}' containers
| | Create all '${container_group}' containers
| | Configure VPP in all '${container_group}' containers
| | Acquire all '${container_group}' containers
| | Create all '${container_group}' containers
| | Configure VPP in all '${container_group}' containers
-| | Stop VPP service on all DUTs | ${nodes}
-| | Install VPP in all '${container_group}' containers
-| | Start VPP service on all DUTs | ${nodes}
+| | Start VPP in all '${container_group}' containers
| | Append To List | ${container_groups} | ${container_group}
| Tear down TAP functional test
| | Append To List | ${container_groups} | ${container_group}
| Tear down TAP functional test