Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

@@ -7,7 +7,10 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 remote=$ONOS_USER@${1:-$OCI}
+instance=$2
 
-LOG=$ONOS_INSTALL_DIR/log/karaf.log
+[ -n "$instance" ] && \
+    LOG=$ONOS_INSTALL_DIR/$KARAF_DIST/instances/$instance/data/log/karaf.log || \
+    LOG=$ONOS_INSTALL_DIR/log/karaf.log
 
 ssh $remote "egrep 'ERROR|Exception' $LOG"

@@ -39,8 +39,9 @@ ssh $remote "
     [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf
     echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
 
-    # Remove any previous ON.Lab bits from ~/.m2 repo
+    # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it.
     rm -fr ~/.m2/repository/org/onlab
+    cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab
 
     # Drop log level for the console
     echo "log4j.logger.org.apache.sshd = WARN" \

@@ -7,8 +7,11 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 remote=$ONOS_USER@${1:-$OCI}
+instance=$2
 
-LOG=$ONOS_INSTALL_DIR/log/karaf.log
+[ -n "$instance" ] && \
+    LOG=$ONOS_INSTALL_DIR/$KARAF_DIST/instances/$instance/data/log/karaf.log || \
+    LOG=$ONOS_INSTALL_DIR/log/karaf.log
 
 trap "ssh $remote 'ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill'" EXIT