[ONOS-6622] Remove test Steps that try to build using Maven
Change-Id: Iefee31042f88d0e326a3297f5640d36865187267
diff --git a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
index 1c19c30..b3d34de 100644
--- a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
+++ b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
@@ -34,19 +34,11 @@
main.log.report( "Uninstalling ONOS" )
main.ONOSbench.onosUninstall( ONOS1Ip )
- # cleanInstallResult = main.TRUE
# gitPullResult = main.TRUE
main.step( "Git pull" )
gitPullResult = main.ONOSbench.gitPull()
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall( mciTimeout = 1000 )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- cleanInstallResult = main.TRUE
main.ONOSbench.getVersion( report = True )
@@ -71,9 +63,8 @@
cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
commandlineTimeout = 100, onosStartTimeout = 600 )
- case1Result = ( cleanInstallResult and packageResult and
- cellResult and verifyResult and
- onos1InstallResult and
+ case1Result = ( packageResult and cellResult and
+ verifyResult and onos1InstallResult and
onos1Isup and secureSshResult and
cliResult )
diff --git a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
index 9d6ae4a..0134e42 100644
--- a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
+++ b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
@@ -32,21 +32,11 @@
main.log.report( "Uninstalling ONOS" )
main.ONOSbench.onosUninstall( ONOS1Ip )
- cleanInstallResult = main.TRUE
- gitPullResult = main.TRUE
-
main.step( "Git pull" )
gitPullResult = main.FALSE
#Need to push some new code to ONOS before using the git pull
#gitPullResult = main.ONOSbench.gitPull()
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- #cleanInstallResult = main.ONOSbench.cleanInstall()
- cleanInstallResult = main.ONOSbench.cleanInstall( skipTest=True)
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
main.step( "Creating ONOS package" )
@@ -70,9 +60,8 @@
cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
commandlineTimeout=100, onosStartTimeout=600)
- case1Result = ( cleanInstallResult and packageResult and
- cellResult and verifyResult and
- onos1InstallResult and
+ case1Result = ( packageResult and cellResult and
+ verifyResult and onos1InstallResult and
onos1Isup and secureSshResult and
cliResult )
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
index bf2a2b6..501cbb3 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
@@ -28,8 +28,8 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
index 69e9aef..983ac75 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
@@ -126,18 +126,6 @@
actual=gitPullResult2,
onpass="Git pull ONOS succeeded",
onfail="Git pull ONOS failed" )
-
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- mciResult = main.ONOSbench.cleanInstall( mciTimeout=1000 )
- utilities.assert_equals( expect=main.TRUE,
- actual=mciResult,
- onpass="Maven clean install ONOS succeeded",
- onfail="Maven clean install ONOS failed" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- mciResult = main.TRUE
'''
main.ONOSbench.getVersion( report=True )
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
index d5d913e..ae706b3 100644
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
@@ -74,8 +74,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
-
main.step( "Starting Mininet" )
# scp topo file to mininet
# TODO: move to params?