Change oshinko version to v0.4.6 and change spark version to 2.2.1 (#191)

* Change oshinko version to v0.4.6 and change spark version to 2.2.1

* Remove ephemeral tests from travis temporarily

The tests are running past the travis time limit, so
they'll have to be broken up or shortened.

* Remove stub pyspark s2i assemble from testing

Author: tmckayus

.travis.yml

@@ -8,7 +8,6 @@ matrix:
   # no need to include the build target at present because the template
   # tests perform builds from the local source to do the tests
   include:
-    - env: TO_TEST=ephemeral
     - env: TO_TEST=pyspark-templates
     - env: TO_TEST=java-templates
     - env: TO_TEST=scala-templates
@@ -72,7 +71,6 @@ install:
 before_script:
 - test/travis-help/check-tarballs.sh
 script:
-- if [ "$TO_TEST" == "ephemeral" ]; then make test-ephemeral ; fi
 - if [ "$TO_TEST" == "pyspark-templates" ]; then make test-pyspark-templates ; fi
 - if [ "$TO_TEST" == "java-templates" ]; then make test-java-templates ; fi
 - if [ "$TO_TEST" == "scala-templates" ]; then make test-scala-templates ; fi

image.java.yaml

@@ -16,7 +16,7 @@ labels:
   - name: "io.openshift.tags"
     value: "builder,radanalytics,java_spark"
   - name: "io.radanalytics.sparkdistro"
-    value: "https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+    value: "https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz"
 envs:
   - name: RADANALYTICS_JAVA_SPARK
     value: 1.0
@@ -36,10 +36,10 @@ packages:
     - tar
     - wget
 artifacts:
-  - url: https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz
-    md5: 1715b661bdf33b40c98b3daa7837f690
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
-    md5: 4c947295bdd95ab4300ffdd60321ed8a
+  - url: https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz
+    md5: c0081f6076070f0a6c6a607c71ac7e95
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.6/oshinko_v0.4.6_linux_amd64.tar.gz
+    md5: 221aec864048447bea92924ce7d376d7
 run:
     user: 185
     cmd:

image.pyspark.yaml

@@ -16,7 +16,7 @@ labels:
   - name: "io.openshift.tags"
     value: "builder,radanalytics,pyspark"
   - name: "io.radanalytics.sparkdistro"
-    value: "https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+    value: "https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz"
 envs:
   - name: RADANALYTICS_PYSPARK
     value: 1.0
@@ -38,10 +38,10 @@ packages:
     install:
       - java-1.8.0-openjdk
 artifacts:
-  - url: https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz
-    md5: 1715b661bdf33b40c98b3daa7837f690
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
-    md5: 4c947295bdd95ab4300ffdd60321ed8a
+  - url: https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz
+    md5: c0081f6076070f0a6c6a607c71ac7e95
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.6/oshinko_v0.4.6_linux_amd64.tar.gz
+    md5: 221aec864048447bea92924ce7d376d7
 run:
     user: 185
     cmd:

image.scala.yaml

@@ -16,7 +16,7 @@ labels:
   - name: "io.openshift.tags"
     value: "builder,radanalytics,scala_spark"
   - name: "io.radanalytics.sparkdistro"
-    value: "https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
+    value: "https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz"
 envs:
   - name: PATH
     value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark/bin:/opt/scala/bin:/opt/sbt/bin
@@ -39,8 +39,8 @@ artifacts:
     md5: e7e1f7ddc8873d228d611e801b8d2795
   - url: http://dl.bintray.com/sbt/native-packages/sbt/0.13.13/sbt-0.13.13.tgz
     md5: 30a238d1b0cc2821da2b9b4e830ef204
-  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.5/oshinko_v0.4.5_linux_amd64.tar.gz
-    md5: 4c947295bdd95ab4300ffdd60321ed8a
+  - url: https://github.com/radanalyticsio/oshinko-cli/releases/download/v0.4.6/oshinko_v0.4.6_linux_amd64.tar.gz
+    md5: 221aec864048447bea92924ce7d376d7
 run:
   user: 185
   cmd:

java-build/Dockerfile

@@ -36,7 +36,7 @@ LABEL name="$JBOSS_IMAGE_NAME" \
       io.openshift.expose-services="8080:http" \
       io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
       io.openshift.tags="builder,radanalytics,java_spark" \
-      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz" \
+      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz" \
       org.concrt.version="1.4.0"
 
 
@@ -51,8 +51,8 @@ RUN yum install -y  epel-release tar wget \
 # Add all artifacts to the /tmp/artifacts
 # directory
 COPY \
-    spark-2.2.0-bin-hadoop2.7.tgz \
-    oshinko_v0.4.5_linux_amd64.tar.gz \
+    spark-2.2.1-bin-hadoop2.7.tgz \
+    oshinko_v0.4.6_linux_amd64.tar.gz \
     /tmp/artifacts/
 
 # Add scripts used to configure the image

…-build/oshinko_v0.4.5_linux_amd64.tar.gz …-build/oshinko_v0.4.6_linux_amd64.tar.gzjava-build/oshinko_v0.4.5_linux_amd64.tar.gz renamed to java-build/oshinko_v0.4.6_linux_amd64.tar.gz java-build/oshinko_v0.4.5_linux_amd64.tar.gz renamed to java-build/oshinko_v0.4.6_linux_amd64.tar.gz

@@ -38,7 +38,7 @@ LABEL name="$JBOSS_IMAGE_NAME" \
       io.openshift.expose-services="8080:http" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.openshift.tags="builder,radanalytics,pyspark" \
-      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz" \
+      io.radanalytics.sparkdistro="https://archive.apache.org/dist/spark/spark-2.2.1/spark-2.2.1-bin-hadoop2.7.tgz" \
       org.concrt.version="1.4.0"
 
 
@@ -53,8 +53,8 @@ RUN yum install -y  java-1.8.0-openjdk \
 # Add all artifacts to the /tmp/artifacts
 # directory
 COPY \
-    spark-2.2.0-bin-hadoop2.7.tgz \
-    oshinko_v0.4.5_linux_amd64.tar.gz \
+    spark-2.2.1-bin-hadoop2.7.tgz \
+    oshinko_v0.4.6_linux_amd64.tar.gz \
     /tmp/artifacts/
 
 # Add scripts used to configure the image