Use buck for tests
- use buck instead of maven
- cleanup output when building cluster.json file
- swap the correct nodes in swap nodes test
(cherry picked from commit 4b66b32e5057d84175195a9c5a823e59cb66fa67)
Change-Id: If5981567115fd3acdc353f4a2ee620f5e0a29716
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index b0bc126..4fd29f3 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -238,14 +238,20 @@
main.log.warn( sed )
main.log.warn( repr( sed ) )
handle.sendline( sed )
+ handle.expect( metaFile )
+ output = handle.before
handle.expect( "\$" )
- main.log.debug( repr( handle.before ) )
+ output += handle.before
+ main.log.debug( repr( output ) )
main.step( "Creating ONOS package" )
- packageResult = main.ONOSbench.onosPackage()
+ packageResult = main.ONOSbench.buckBuild()
utilities.assert_equals( expect=main.TRUE, actual=packageResult,
onpass="ONOS package successful",
onfail="ONOS package failed" )
+ if not packageResult:
+ main.cleanup()
+ main.exit()
main.step( "Installing ONOS package" )
onosInstallResult = main.TRUE