홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
82082055 1 parent aec251d6

Fixing onos-package to include automatic karaf-assembly stage; 

otherwise artifacts built using plain 'mvn' or 'obs' won't be included.

Change-Id: I71b7a27cff3a8faea2e2589a921e1f639cedd5b7
Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
54 54
55 <module>tools/package/archetypes</module> 55 <module>tools/package/archetypes</module>
56 <module>tools/package/branding</module> 56 <module>tools/package/branding</module>
57 - <module>tools/package/karaf-assembly</module>
58 <module>tools/package/maven-plugin</module> 57 <module>tools/package/maven-plugin</module>
59 <module>tools/build/conf</module> 58 <module>tools/build/conf</module>
60 </modules> 59 </modules>
......
...@@ -158,6 +158,11 @@ function build_rpm() { ...@@ -158,6 +158,11 @@ function build_rpm() {
158 # Bail on any errors 158 # Bail on any errors
159 set -e 159 set -e
160 160
161 +# Run karaf assembly to collect artifacts for off-line installations.
162 +aux=/tmp/assembly-$$.log
163 +trap "rm -f $aux 2>/dev/null" EXIT
164 +cd $ONOS_ROOT/tools/package/karaf-assembly && mvn clean install > $aux 2>&1
165 +
161 # Before starting make sure the environment is clan - delete onos staging folder 166 # Before starting make sure the environment is clan - delete onos staging folder
162 rm -fr $ONOS_STAGE 167 rm -fr $ONOS_STAGE
163 168
......