diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2023-05-05 09:26:12 +0000 |
|---|---|---|
| committer | Peter Mikus <peter.mikus@protonmail.ch> | 2023-05-05 09:32:26 +0000 |
| commit | 4fef5ddc97a8acec3b3cb41e67736385f93081b6 (patch) | |
| tree | 22501f61abfb4c49c551e99e3866485201b848df /resources/libraries/robot/shared | |
| parent | d74acc4db2987d9ac40aae10be8453c922a16731 (diff) | |
fix(core): Docker detection
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I976f96410b06b4f4d7500b03b1f5dd54486bbf42
Diffstat (limited to 'resources/libraries/robot/shared')
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 931508bdc9..ed695af541 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -85,8 +85,9 @@ | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive | | ${dut1_uuid_length} = | Get Length | ${DUT1_UUID} -| | ${root}= | Run Keyword If | ${dut1_uuid_length} -| | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${DUT1_UUID} +| | ${in_container}= | Running in Container | ${nodes['${dut}']} +| | ${root}= | Run Keyword If | ${in_container} +| | ... | Get Docker Mergeddir | ${nodes['DUT1']} | | ... | ELSE | Set Variable | ${EMPTY} | | ${node_arch}= | Get Node Arch | ${nodes['${dut}']} | | ${name}= | Set Variable | ${dut}_${container_group}${nf_id}${DUT1_UUID} |