Repository: incubator-zeppelin Updated Branches: refs/heads/master 7ddf810ef -> 6ac8b3d4f
Fix CI failing in master branch This is fix for CI failing in master branch. By removing zeppelin.interpreters property from test resources, let test perform with default values defined in ZeppelinConfiguration. Author: Lee moon soo <[email protected]> Closes #253 from Leemoonsoo/fix_ci and squashes the following commits: afb9073 [Lee moon soo] Remove zeppelin.interpreter property from test resources Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/6ac8b3d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/6ac8b3d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/6ac8b3d4 Branch: refs/heads/master Commit: 6ac8b3d4ff18a349b4a2f01b50f814ac232a73bb Parents: 7ddf810 Author: Lee moon soo <[email protected]> Authored: Mon Aug 24 19:36:12 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Mon Aug 24 20:21:47 2015 -0700 ---------------------------------------------------------------------- zeppelin-server/src/test/resources/zeppelin-site-star.xml | 6 ------ zeppelin-server/src/test/resources/zeppelin-site.xml | 6 ------ zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml | 5 ----- zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml | 6 ------ zeppelin-zengine/src/test/resources/zeppelin-site.xml | 6 ------ 5 files changed, 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ac8b3d4/zeppelin-server/src/test/resources/zeppelin-site-star.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/resources/zeppelin-site-star.xml b/zeppelin-server/src/test/resources/zeppelin-site-star.xml index 8f3f4c1..93dc0ed 100644 --- a/zeppelin-server/src/test/resources/zeppelin-site-star.xml +++ b/zeppelin-server/src/test/resources/zeppelin-site-star.xml @@ -84,12 +84,6 @@ </property> <property> - <name>zeppelin.interpreters</name> - <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter</value> - <description>Comma separated interpreter configurations. First interpreter become a default</description> -</property> - -<property> <name>zeppelin.interpreter.connect.timeout</name> <value>30000</value> <description>Interpreter process connect timeout in msec.</description> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ac8b3d4/zeppelin-server/src/test/resources/zeppelin-site.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/resources/zeppelin-site.xml b/zeppelin-server/src/test/resources/zeppelin-site.xml index ae5cea1..3215c5b 100644 --- a/zeppelin-server/src/test/resources/zeppelin-site.xml +++ b/zeppelin-server/src/test/resources/zeppelin-site.xml @@ -84,12 +84,6 @@ </property> <property> - <name>zeppelin.interpreters</name> - <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter</value> - <description>Comma separated interpreter configurations. First interpreter become a default</description> -</property> - -<property> <name>zeppelin.interpreter.connect.timeout</name> <value>30000</value> <description>Interpreter process connect timeout in msec.</description> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ac8b3d4/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml b/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml index cf83b54..8913d25 100644 --- a/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml +++ b/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml @@ -83,11 +83,6 @@ <description>Interpreter implementation base directory</description> </property> -<property> - <name>zeppelin.interpreters</name> - <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter</value> - <description>Comma separated interpreter configurations. First interpreter become a default</description> -</property> <property> <name>zeppelin.interpreter.connect.timeout</name> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ac8b3d4/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml b/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml index ae5cea1..3215c5b 100644 --- a/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml +++ b/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml @@ -84,12 +84,6 @@ </property> <property> - <name>zeppelin.interpreters</name> - <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter</value> - <description>Comma separated interpreter configurations. First interpreter become a default</description> -</property> - -<property> <name>zeppelin.interpreter.connect.timeout</name> <value>30000</value> <description>Interpreter process connect timeout in msec.</description> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ac8b3d4/zeppelin-zengine/src/test/resources/zeppelin-site.xml ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/resources/zeppelin-site.xml b/zeppelin-zengine/src/test/resources/zeppelin-site.xml index 57d1b23..f34540a 100644 --- a/zeppelin-zengine/src/test/resources/zeppelin-site.xml +++ b/zeppelin-zengine/src/test/resources/zeppelin-site.xml @@ -84,12 +84,6 @@ </property> <property> - <name>zeppelin.interpreters</name> - <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter,org.apache.zeppelin.flink.FlinkInterpreter,org.apache.zeppelin.lens.LensInterpreter,org.apache.zeppelin.ignite.IgniteInterpreter,org.apache.zeppelin.ignite.IgniteSqlInterpreter,org.apache.zeppelin.cassandra.CassandraInterpreter,org.apache.zeppelin.geode.GeodeOqlInterpreter,org.apache.zeppelin.postgresql.PostgreSqlInterpreter</value> - <description>Comma separated interpreter configurations. First interpreter become a default</description> -</property> - -<property> <name>zeppelin.interpreter.connect.timeout</name> <value>30000</value> <description>Interpreter process connect timeout in msec.</description>
