https://gerrit.fd.io/r/#/c/9257/ moved VPP instalation
to vpp/func/__init__.robot,
which is run before Honeycomb suite.
Instalation process starts with removing all vpp packages,
which fails because of honeycomb dependency installed by bootstrap script.
This patch fixes HC func jobs by moving them to separate dir.
The honeycomb/func/__init__.robot was updated
to include previous content of vpp/func/__init__.robot.
HC perf jobs were also moved,
but they may require additional care (CSIT-1006).
Change-Id: I99d94272c80a4c57c85ec5cf99cddfbeab7de663
Signed-off-by: Marek Gradzki <[email protected]>
# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.vpp.func" \
+ --suite "tests.honeycomb.func" \
--include HC_FUNC \
--exclude HC_NSHORHC_REST_ONLY \
--noncritical EXPECTED_FAILING \
# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.vpp.func" \
+ --suite "tests.honeycomb.func" \
--include HC_FUNC \
--exclude HC_NSH \
--noncritical EXPECTED_FAILING \
# run full performance test suite and exit on fail
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "tests.vpp.perf.honeycomb" \
+ -s "tests.honeycomb.perf" \
--variable install_dir:${INSTALLATION_DIR} \
tests/
RETURN_STATUS=$(echo $?)
# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.vpp.func" \
+ --suite "tests.honeycomb.func" \
--include HC_FUNC \
--exclude HC_NSHORHC_REST_ONLY \
--noncritical EXPECTED_FAILING \
# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.vpp.func" \
+ --suite "tests.honeycomb.func" \
--include HC_FUNC \
--exclude HC_NSH \
--noncritical EXPECTED_FAILING \
| ${node}= | ${nodes['DUT1']}
*** Settings ***
+| Library | resources.libraries.python.SetupFramework
+| Library | resources.libraries.python.SetupFramework.CleanupFramework
| Library | resources/libraries/python/honeycomb/HcPersistence.py
| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/honeycomb/honeycomb.robot
| ...
-| Suite Setup | Run Keywords | Configure all DUTs before test | AND
+| Suite Setup | Run Keywords | Setup Framework | ${nodes} | AND
+| ... | Setup All DUTs | ${nodes} | AND
+| ... | Update All Interface Data On All Nodes | ${nodes} | AND
+| ... | Configure all DUTs before test | AND
| ... | Set Global Variable | ${node} | AND
| ... | Stop Honeycomb service on DUTs | ${node} | AND
| ... | Clear Honeycomb Log | ${node}
| ...
-| Suite Teardown | Archive Honeycomb log file | ${node}
+| Suite Teardown | Run Keywords | Archive Honeycomb log file | ${node} | AND
+| ... | Cleanup Framework | ${nodes}
Code Review / csit.git / commitdiff