test build if mar files exist.

docker/Dockerfile

@@ -9,6 +9,8 @@ USER modelscoring
 WORKDIR /home/modelscoring/
 ADD $MODEL_SCORING_PACKAGE .
 
+EXPOSE 9100
+
 WORKDIR /home/modelscoring/
 ENTRYPOINT [ "bin/model-scoring.sh" ]
 

docker/build.sh

@@ -37,7 +37,7 @@ echo Base name $NAME
 NAME=${NAME//.zip/}
 echo Base name $NAME
 
-echo docker build --file=Dockerfile --tag=scoring-engine   \
+echo docker build --file=Dockerfile --tag=scoring-engine-$BUILD_NUMBER   \
  --build-arg HTTP_PROXY=$http_proxy \
  --build-arg HTTPS_PROXY=$http_proxy \
  --build-arg NO_PROXY=$no_proxy \
@@ -46,7 +46,7 @@ echo docker build --file=Dockerfile --tag=scoring-engine   \
  --build-arg no_proxy=$no_proxy \
  --build-arg MODEL_SCORING_PACKAGE=$NAME \
  .
-docker build --file=Dockerfile --tag=scoring-engine   \
+docker build --file=Dockerfile --tag=scoring-engine-$BUILD_NUMBER   \
  --build-arg HTTP_PROXY=$http_proxy \
  --build-arg HTTPS_PROXY=$http_proxy \
  --build-arg NO_PROXY=$no_proxy \
@@ -56,3 +56,50 @@ docker build --file=Dockerfile --tag=scoring-engine   \
  --build-arg MODEL_SCORING_PACKAGE=$NAME \
  .
 
+mars=$(find `pwd`  -name "*.mar" -type f )
+IFS=$'\n'
+for mar in $mars
+do
+    echo
+    echo $mar
+    MARNAME="`basename $mar`"
+    echo Base name $MARNAME
+    MARNAME=${MARNAME//.mar/}
+    echo Base name $MARNAME
+    docker kill $MARNAME-$BUILD_NUMBER
+    docker rm $MARNAME-$BUILD_NUMBER
+done
+
+for mar in $mars
+do
+    echo
+    echo $mar
+    MARNAME="`basename $mar`"
+    echo Base name $MARNAME
+    MARNAME=${MARNAME//.mar/}
+    echo Base name $MARNAME
+    DOCKERCONT=$MARNAME-$BUILD_NUMBER
+    docker kill $DOCKERCONT
+    docker rm $DOCKERCONT
+    docker run -it -d -p 9100:9100 --name=$DOCKERCONT scoring-engine-$BUILD_NUMBER
+    MAX=20
+    code=$(curl -s -o /dev/null  localhost:9100 -w "%{http_code}")
+    count=$((0))
+    while [ $code -ne 200 ] && [ $count -lt $MAX ];
+    do
+        echo $code
+        code=$(curl -s -o /dev/null  localhost:9100 -w "%{http_code}")
+        count=$((0+1))
+        sleep 1
+    done
+    code=$(curl -F "file=@$mar" -s -o /dev/null  localhost:9100/uploadMarFile -w "%{http_code}")
+    if [ $code -ge 200 ] && [ $code -lt 400 ]; then
+        echo yes $code
+    else
+        echo failed to load model $mar, http status code $code
+        docker logs $DOCKERCONT
+        exit 1
+    fi
+    docker kill $DOCKERCONT
+    docker rm $DOCKERCONT
+done

model-scoring-core/bin/model-scoring.sh

@@ -27,11 +27,8 @@ export HOSTNAME=`hostname`
 # It is difficult to modify the library path for dynamic libraries after the Java process has started
 # LD_LIBRARY_PATH allows the OS to find the dynamic libraries and any dependencies
 export MODEL_TMP_DIR=`mktemp -d -t tap-scoring-modelXXXXXXXXXXXXXXXXXX`
-
-
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MODEL_TMP_DIR
 
-
 MODEL_SCORING_MAIN="org.trustedanalytics.scoring.MyMainFunction"
 
 

model-scoring-core/bin/scoring-server.sh

@@ -15,10 +15,10 @@
 #  limitations under the License.
 #
 
-#set -o errexit
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 
 pushd $DIR/..
+
 pwd
 
 export HOSTNAME=`hostname`

model-scoring-core/conf/application.conf.scoring

@@ -2,7 +2,7 @@
 #The mar file path can be provided on the command line with a java property
 #-Dtrustedanalytics.scoring-engine.archive-mar="SOME_PATH"
 trustedanalytics.scoring-engine {
-  archive-mar = "hdfs://SOME_PATH/SOME_TAR"
+  archive-mar = ""
 }
 
 #-Dtrustedanalytics.scoring.port="SOME_PORT"

model-scoring-core/pom.xml

@@ -69,9 +69,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>

pom.xml

@@ -130,7 +130,9 @@
                 <version>1.3.2</version>
              </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>default-compile</id>
@@ -258,11 +260,9 @@
         </pluginManagement>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
+                <version>3.6.0</version>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>