commit 3933295cd0aff9d669bd3ec27a7a78ac4ad216d1
author Ray Milkey <ray@opennetworking.org> Mon Jul 16 13:42:51 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Jul 17 16:17:31 2018 +0000
tree d4601b840997dc0ccbc196695251502156a8ab77
parent e0c98dbd918c757a3c7bf92b8137403acb1a2d01

Bazel build for STC runs

Change-Id: I75806c0cb5b71402b7e3519a84498f8e05a9cf8a

tools/build/envDefaults

diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index d87acbc..190f7de 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -33,10 +33,15 @@
 export ONOS_TAR=$ONOS_STAGE.tar.gz
 export ONOS_ZIP=$ONOS_STAGE.zip
 
-# If the BUCK-built bits are newer than the Maven-built bits, use the former.
+# If the bazel-built bits are newer than the buck-built bits, use the former.
 BUCK_TAR=$ONOS_ROOT/buck-out/gen/tools/package/onos-package/onos.tar.gz
-if [ -f $BUCK_TAR ] && [ $BUCK_TAR -nt $ONOS_TAR ]; then
-    rm -f $ONOS_TAR >/dev/null; ln -s $BUCK_TAR $ONOS_TAR
+BAZEL_TAR=$ONOS_ROOT/bazel-bin/onos.tar.gz
+if [ -f $BAZEL_TAR ] && [ $BAZEL_TAR -nt $ONOS_TAR ]; then
+    rm -f $ONOS_TAR >/dev/null; ln -s $BAZEL_TAR $ONOS_TAR
+else
+    if [ -f $BUCK_TAR ] && [ $BUCK_TAR -nt $ONOS_TAR ]; then
+        rm -f $ONOS_TAR >/dev/null; ln -s $BUCK_TAR $ONOS_TAR
+    fi
 fi
 
 # ONOS test bits (onos-test.tar.gz) staging environment