diff options
| author |   pmikus <pmikus@cisco.com> | 2016-04-04 15:26:41 +0200 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-04-05 14:22:01 +0000 |
| commit | bea34e37b99cd3312dfb5733edea7586fbc8e1c6 (patch) | |
| tree | 6d76ba4c8119292226486dcd081dd46a21c7a852 | |
| parent | 4c597cafd320c1e68f81768e14abc9f89bbc07e2 (diff) | |
Add tag support to boostrap-verify-perf
- support tags in vpp-verify-perfomance-* jenkins jobs
Change-Id: I7e3abfe9e552a3f2fa9ebf95df9b48bcbae3561a
Signed-off-by: pmikus <pmikus@cisco.com>
| -rwxr-xr-x | bootstrap-verify-perf.sh | 16 | ||||
| -rwxr-xr-x | resources/tools/topo_installation.py | 9 |
2 files changed, 18 insertions, 7 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 746d1a0a58..c16240821c 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -76,7 +76,15 @@ function cancel_reservation { # On script exit we cancel the reservation and delete all vpp packages trap "cancel_reservation ${WORKING_TOPOLOGY}" EXIT -# run performance test suite -pybot -L TRACE \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s performance tests/ + +if [ ! -z "$TEST_TAG" ]; then +# run specific performance tests by tag if variable is set + pybot -L TRACE \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -i $TEST_TAG tests/ +else +# run full performance test suite + pybot -L TRACE \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s performance tests/ +fi diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py index 7fb60aca15..660fb3b946 100755 --- a/resources/tools/topo_installation.py +++ b/resources/tools/topo_installation.py @@ -23,6 +23,8 @@ from yaml import load from resources.libraries.python.ssh import SSH def main(): + """Copy and installation of VPP packages.""" + parser = argparse.ArgumentParser() parser.add_argument("-t", "--topo", required=True, help="Topology file") @@ -45,12 +47,13 @@ def main(): # Copy packages from local path to installation dir for deb in packages: - ssh.scp(local_path=deb,remote_path=install_dir) + ssh.scp(local_path=deb, remote_path=install_dir) # Installation of VPP deb packages - ret, _, err = ssh.exec_command("dpkg -i {}*.deb".format(install_dir)) + ret, _, err = ssh.exec_command_sudo( + "dpkg -i {}*.deb".format(install_dir)) if ret != 0: - print("Installation unsuccessful:\n{}".format(err)) + print "Installation unsuccessful:\n{}".format(err) return ret if __name__ == "__main__": |