zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2230] .travis.yml protecting against ambiguous commit range
Date Wed, 22 Mar 2017 23:20:12 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.7 071193ebd -> ab15bad6f


[ZEPPELIN-2230] .travis.yml protecting against ambiguous commit range

Following the revert of [#2111](https://github.com/apache/zeppelin/pull/2111
) I added some protection in case TRAVIS_COMMIT_RANGE is "ambiguous" i.e. some paths or commits
are not found within the range. (can happen on some push --force).

Bug Fix

* [ ] - Task

[ZEPPELIN-2230](https://issues.apache.org/jira/browse/ZEPPELIN-2230)

Re-do a twisted git push --force.

* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Remilito <remy.gayet@gmail.com>

Closes #2167 from Remilito/ZEPPELIN-2230b and squashes the following commits:

97968f9 [Remilito] Protecting against ambiguous TRAVIS_COMMIT_RANGE. E.g.: when push force,
some commits might be missing from the origin branch, therefore causing an unsusable COMMIT_RANGE.
cb9647f [Remilito] [ZEPPELIN-2230] clear bower_contents if bower.json changed or bower clear
provided in commit message

(cherry picked from commit 405cb44cf1b13d0fe6b8d4a64d28bf0faf7606d4)
Signed-off-by: Lee moon soo <moon@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ab15bad6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ab15bad6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ab15bad6

Branch: refs/heads/branch-0.7
Commit: ab15bad6fa8a0da0d7a019c6e80355ab3bf2eada
Parents: 071193e
Author: Remilito <remy.gayet@gmail.com>
Authored: Mon Mar 20 11:32:59 2017 +0100
Committer: Lee moon soo <moon@apache.org>
Committed: Wed Mar 22 16:19:54 2017 -0700

----------------------------------------------------------------------
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ab15bad6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f8f2a97..47d2f94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ cache:
     - ${HOME}/R
     -  zeppelin-web/node
     -  zeppelin-web/node_modules
+    -  zeppelin-web/bower_components
 
 addons:
   apt:
@@ -85,6 +86,14 @@ matrix:
       env: SCALA_VER="2.10" $LIVY_VER="0.2.0" SPARK_VER="1.5.2" HADOOP_VER="2.6" PROFILE="-Pspark-1.5
-Phadoop-2.6" BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl
zeppelin-interpreter,livy" TEST_PROJECTS="-DfailIfNoTests=false"
 
 before_install:
+  # check files included in commit range, clear bower_components if a bower.json file has
changed.
+  # bower cache clearing can also be forced by putting "bower clear" or "clear bower" in
a commit message
+  - changedfiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE 2>/dev/null) || changedfiles=""
+  - echo $changedfiles
+  - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true);
+  - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" 
+  - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true)
+  - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components
cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components.";
fi
   - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'"
>> ~/.mavenrc
   - ./testing/install_external_dependencies.sh
   - ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true
@@ -121,3 +130,7 @@ after_failure:
   - ls -R livy/target/tmp/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*
   - cat livy/target/tmp/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stdout
   - cat livy/target/tmp/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stderr
+  - cat livy/target/tmp/livy-int-test/*/output.log
+  - ls -R livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*
+  - cat livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stdout
+  - cat livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stderr


Mime
View raw message