From fdc4b402da9e0776a9deb94e789716e0a1e5c106 Mon Sep 17 00:00:00 2001
From: Frank Austin Nothaft <fnothaft@alumni.stanford.edu>
Date: Fri, 21 Jul 2017 20:57:50 -0700
Subject: [PATCH] =?UTF-8?q?[ADAM-1607]=20Update=20distribution=20assembly?=
 =?UTF-8?q?=20task=20to=20attach=20assembly=20=C3=BCberjar.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves #1607. 3ea4f18e2275bdbed7609403098aa4194b03003a 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.
---
 distribution/src/main/assembly/assembly.xml | 2 +-
 scripts/jenkins-test                        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
index 4099684306..add3c4aeef 100644
--- a/distribution/src/main/assembly/assembly.xml
+++ b/distribution/src/main/assembly/assembly.xml
@@ -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>
diff --git a/scripts/jenkins-test b/scripts/jenkins-test
index a46573d4b2..ef24e7136b 100755
--- a/scripts/jenkins-test
+++ b/scripts/jenkins-test
@@ -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}