commit 8d7c77814ae603972743dfc02a617fb787a2c369
author Devin Lim <devin@onlab.us> Wed Jun 07 16:21:20 2017 -0700
committer Devin Lim <devin@onlab.us> Wed Jun 07 16:44:28 2017 -0700
tree a09513b1868ca3d28edab373b1d83313b01bf946
parent f4a411a2f06d3c7e1486c3da8fbbc72f4165d678

[ONOS-6622] Remove test Steps that try to build using Maven

Change-Id: Iefee31042f88d0e326a3297f5640d36865187267

TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py

diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index 9032e1f..3d46cc8 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -115,14 +115,6 @@
         commit = main.ONOSbench.getVersion(report=True)
         commit = commit.split(" ")[1]
 
-        if gitPull == 'True':
-            if not main.startUp.onosBuild( main, gitBranch ):
-                main.log.error( "Failed to build ONOS" )
-                main.cleanup()
-                main.exit()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         with open(main.dbFileName, "a") as dbFile:
             temp = "'" + commit + "',"
             temp += "'" + nic + "',"

TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py

diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
index bf2a2b6..501cbb3 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/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