fixup .travis.yml

Author: vroyer

.travis.yml

@@ -35,29 +35,23 @@ cache:
     - $HOME/google-cloud-sdk/
 
 before_install:
+  - export JAVA8_HOME=$JAVA_HOME
   - wget https://github.com/strapdata/bach/raw/master/install-jdk.sh
-  - chmod a+x install-jdk.sh
+  - chmod a+x install-jdk.sh && ./install-jdk.sh -v -f 9;
+  - keytool -import -trustcacerts -keystore $JAVA9_HOME/lib/security/cacerts -storepass changeit -alias SFSRootCAG2x -file SFSRootCAG2.pem -noprompt
   # solves gpg server problems
   # - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
   - wget -O ecm-ccm-elassandra.zip https://github.com/strapdata/ecm/archive/ccm-elassandra.zip
   - unzip ecm-ccm-elassandra.zip && cd ecm-ccm-elassandra && sudo ./setup.py install
-
-#matrix:
-#  include:
-# Java 10 "Oracle JDK"
-#    - env: JDK='Oracle JDK 10'
-#      install: . ./install-jdk.sh -v -f 9; keytool -import -trustcacerts -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -alias SFSRootCAG2x -file SFSRootCAG2.pem -noprompt
+  
 
 install:
-  - export JAVA8_HOME=$JAVA_HOME
-  - ./install-jdk.sh -v -f 9;
-  - export JAVA_HOME=$JAVA9_HOME
-  - keytool -import -trustcacerts -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -alias SFSRootCAG2x -file SFSRootCAG2.pem -noprompt
+  - cd ${TRAVIS_BUILD_DIR}
   - ./gradlew --version
 
 script:
-  - ./gradlew server:test -Dbuild.snapshot=false
-  - ./gradlew assemble -Dbuild.snapshot=false
+  - JAVA_HOME=$JAVA9_HOME ./gradlew server:test -Dbuild.snapshot=false
+  - JAVA_HOME=$JAVA9_HOME ./gradlew assemble -Dbuild.snapshot=false
   - JAVA_HOME=$JAVA8_HOME ./integ-test/test-cleanup-repair.sh $(ls distribution/tar/build/distributions/elassandra-*.tar.gz)
 
 before_deploy:
@@ -83,26 +77,26 @@ deploy:
       tags: true
       repo: strapdata/elassandra
 
-  - provider: releases
-    overwrite: true
-    draft: false
-    api_key:
-      secure: "NN1SqRo+yryyjsnuan7rtqFd7IgVPTTaWO1m8ZptBdPENvapT2SXiCXa9Clrtgyamt3B/j5G8CdRp480xSXI/yUBwHHDE1Q0OV7eV1CfzmZvlXoxS1rWaDByDuFnvXdoQTBij1ytZHgVsfgmHdU47CcmQVpvQi/IQmu+9WEMpIt55l5fLNvIuy5UiynYDchBN1MYkJLxzlSoqmZdmM58DtL/vBg1nDNqsxvaesyh+8RzoQ33uM4+BWItpzjdvwbfCYN5Bsq8lvdPuxCYeQ5b7RWYPxpTNaV7zS8XDvcbgss7DwZ7w59YloDNvL0WbliE7pma3VHnvctX+oQY/LWhdJ3vJwNvmuwW9zgNUz70s5ec9Eos105xWWiKakIMEgtUdW35VBWEdnQdTYo9zbL/2deScXugcWkMv1Cb/EDeo6gFbc6cBL9TivCyWsv7GqMMC13X9Sj3vDi4S+wzMXQAuDgkdFTY2CfjAiFPRlxe9wPn00RAmnpq46Cma+NoAvnqMuCglKi/WAak8byxEMLRskrb5zHXFKTG8xCqiPJpz7hxnMoRULwn9jJj/6xRQlemKY4eF0DLebWmJ8hpebdX+tx6iMhI0qvpOb3j0uvySIi0bmR/6B9PlhULUNzwf+LFoSA37DCxcqDdOQX/qp8FJdBk7fM55lkVvhe+bCzufRg="
-    file:
-      - "$TARBALL"
-      - "$ZIPBALL"
-      - "$RPMPKG"
-      - "$DEBPKG"
+  # build, test and push docker images
+  - provider: script
     skip_cleanup: true
+    script: bash ./ci/docker.sh
     on:
       tags: true
-      repo: strapdata/elassandra-rc
-  
+
+  # bump and push to gke marketplace repo, build gke images, push to gcr.io
+  - provider: script
+    skip_cleanup: true
+    script: bash ./ci/gke-marketplace.sh
+    on:
+      tags: true
+      repo: strapdata/elassandra
+      
   # publish snapshot artifact in strapdata nexus
   - provider: script
     skip_cleanup: true
     script: 
-       - ./gradlew publish -PrepoUsername="${NEXUS_USERNAME}" -PrepoPassword="${NEXUS_PASSWORD}" -PrepoUrl="$NEXUS_URL/maven-snapshots/"
+       - JAVA_HOME=$JAVA9_HOME ./gradlew publish -PrepoUsername="${NEXUS_USERNAME}" -PrepoPassword="${NEXUS_PASSWORD}" -PrepoUrl="$NEXUS_URL/maven-snapshots/"
     on:
       tags: false
       repo: strapdata/elassandra
@@ -111,7 +105,7 @@ deploy:
   - provider: script
     skip_cleanup: true
     script: 
-       - ./gradlew publish -Dbuild.snapshot=false -PrepoUsername="${NEXUS_USERNAME}" -PrepoPassword="${NEXUS_PASSWORD}" -PrepoUrl="$NEXUS_URL/maven-releases-public/"
+       - JAVA_HOME=$JAVA9_HOME ./gradlew publish -Dbuild.snapshot=false -PrepoUsername="${NEXUS_USERNAME}" -PrepoPassword="${NEXUS_PASSWORD}" -PrepoUrl="$NEXUS_URL/maven-releases-public/"
     on:
       tags: true
       repo: strapdata/elassandra
@@ -126,17 +120,4 @@ deploy:
       tags: true
       repo: strapdata/elassandra
 
-  # build, test and push docker images
-  - provider: script
-    skip_cleanup: true
-    script: bash ./ci/docker.sh
-    on:
-      tags: true
 
-  # bump and push to gke marketplace repo, build gke images, push to gcr.io
-  - provider: script
-    skip_cleanup: true
-    script: bash ./ci/gke-marketplace.sh
-    on:
-      tags: true
-      repo: strapdata/elassandra