diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-02-01 14:51:06 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-02-04 17:33:56 +0000 |
| commit | 26637ca4fdb026cea585df4c9e6c0fc2c07492ba (patch) | |
| tree | 6dc6516647a03c3c4925fa6b9edaa53bd66fd7f7 /resources/libraries/robot/shared/default.robot | |
| parent | fbc1d0cede4a36ae0f806b494db1b5eed05bbfd1 (diff) | |
CSIT-1416 Remove installation of vpp from containers
Use parent system (Host, Container) installation of VPP. This will save
the internet bandwith by skip installing of prerequisites packages.
It will also skip dpkg install and simplify the process of initializing
VPP inside container.
Previosly initialization of VPP in container takes about 55s. With this
patch it is reduced to 2-3s.
This patch removes the bloated VOLUME creation between container
sidecars (a.k.a nested container) and fixes the hugepage allocation.
Change-Id: Ifa2be532edb77354657e1b84568bdc34993b00d0
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/shared/default.robot')
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 981bfa1d0d..981c329f63 100644 --- 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: -| | ... | - 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:* | | ... @@ -567,19 +566,18 @@ | | 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_root} | | ... | | Construct chains of containers on all DUTs | ${chains} | ${nodeness} -| | ... | set_nf_cpus=${False} +| | ... | nested=${True} | | 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 |