Fixing onos-package not to be sensitive to cell settings and instead allowing onos-config (used from onos-install) to be fully sensitive to cell settings.
Added onos-package-test and onos-push-test-bits scripts.
Change-Id: Ie3f829f8a6e6d8a419388428feca56b69635ed44
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 31551ea..05b51e6 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -1,6 +1,6 @@
#!/bin/bash
# -----------------------------------------------------------------------------
-# Packages ONOS distributable into onos.tar.gz
+# Packages ONOS distributable into onos.tar.gz and onos.zip
# -----------------------------------------------------------------------------
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
@@ -57,8 +57,6 @@
$KARAF_DIST/system/org/onosproject/$artifact/$ONOS_POM_VERSION
done
-export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo}"
-
# ONOS Patching ----------------------------------------------------------------
# Patch the Apache Karaf distribution file to add ONOS features repository
@@ -66,6 +64,7 @@
$ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
# Patch the Apache Karaf distribution file to load ONOS features
+export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow"
perl -pi.old -e "s|^(featuresBoot=.*)|\1,$ONOS_FEATURES|" \
$ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg