Skip to content

Commit

Permalink
[ADAM-1607] Update distribution assembly task to attach assembly über…
Browse files Browse the repository at this point in the history
…jar.

Resolves #1607. 3ea4f18 renamed the überjar
generated by the adam-assembly package from `adam_<version>.jar` to
`adam-assembly_<version>.jar`, but did not update the distribution
assembly task. This commit updates that task, and adds code to `jenkins-test`
to ensure that the assembly jar is packaged in the distribution.
  • Loading branch information
fnothaft committed Jul 22, 2017
1 parent 6abe7a6 commit 49055ad
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion distribution/src/main/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<fileSet>
<directory>../adam-assembly/target</directory>
<includes>
<include>adam_*.jar</include>
<include>adam-assembly*.jar</include>
</includes>
<outputDirectory>repo</outputDirectory>
<directoryMode>0755</directoryMode>
Expand Down
7 changes: 7 additions & 0 deletions scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ mvn -U \
-Dspark.version=${SPARK_VERSION} \
-DargLine=${ADAM_MVN_TMP_DIR}

# make sure that the distribution package contains an assembly jar
# if no assembly jar is found, this will exit with code 1 and fail the build
tar tzvf distribution/target/adam-distribution_*-bin.tar.gz | \
grep adam-assembly | \
grep jar | \
grep -v -e sources -e javadoc

# we are done with maven, so clean up the maven temp dir
find ${ADAM_MVN_TMP_DIR}
rm -rf ${ADAM_MVN_TMP_DIR}
Expand Down

0 comments on commit 49055ad

Please sign in to comment.