홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
68498e2b 1 parent a7f86ce5

Updating onos-package to display error when karaf-assembly fails. 

Also, temporarily adding snapshot repo to karaf-assembly and filed bug to remove it.

Change-Id: I63bf472b3a918beec46e1b1002a29dfcb6cb7253
Inline Side-by-side
Showing 3 changed files with 12 additions and 2 deletions
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 </dependencies> 70 </dependencies>
71 <repositories> 71 <repositories>
72 <repository> 72 <repository>
73 - <!-- TODO move over to release snmp-core when it becomes available.--> 73 + <!-- TODO move over to release snmp-core when it becomes available. ONOS-3646 -->
74 <id>oss.sonatype.org-snapshot</id> 74 <id>oss.sonatype.org-snapshot</id>
75 <url>http://oss.sonatype.org/content/repositories/snapshots</url> 75 <url>http://oss.sonatype.org/content/repositories/snapshots</url>
76 <snapshots> 76 <snapshots>
......
...@@ -230,7 +230,9 @@ trap "rm -f $aux 2>/dev/null" EXIT ...@@ -230,7 +230,9 @@ trap "rm -f $aux 2>/dev/null" EXIT
230 [ -n "$M2_REPO" ] && args="-Dmaven.repo.local=$M2_REPO" || args="" 230 [ -n "$M2_REPO" ] && args="-Dmaven.repo.local=$M2_REPO" || args=""
231 cd $ONOS_ROOT/tools/package/karaf-assembly && 231 cd $ONOS_ROOT/tools/package/karaf-assembly &&
232 mvn $args clean install > $aux 2>&1 || 232 mvn $args clean install > $aux 2>&1 ||
233 - ( echo "Failed to run karaf-assembly" && exit 1 ) 233 + ( cat $aux &&
234 + printf "\nFailed to run karaf-assembly, which stages artifacts for offline deployments.\n" &&
235 + exit 1 )
234 236
235 # Before starting make sure the environment is clan - delete onos staging folder 237 # Before starting make sure the environment is clan - delete onos staging folder
236 clean_stage_dir 238 clean_stage_dir
......
...@@ -33,6 +33,14 @@ ...@@ -33,6 +33,14 @@
33 33
34 <description>ONOS Apache Karaf assembly definitions</description> 34 <description>ONOS Apache Karaf assembly definitions</description>
35 35
36 + <!-- FIXME this is necessary until snmp moves to release artifacts ONOS-3646 -->
37 + <repositories>
38 + <repository>
39 + <id>snapshot</id>
40 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
41 + </repository>
42 + </repositories>
43 +
36 <build> 44 <build>
37 <plugins> 45 <plugins>
38 <plugin> 46 <plugin>
......