You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/04/07 15:11:51 UTC
incubator-metron git commit: Metron 98 - Travis does not fail a build
if the integration tests fail (merrimanr via cestella) closes
apache/incubator-metron#69
Repository: incubator-metron
Updated Branches:
refs/heads/master 9621c55ec -> a7ea74918
Metron 98 - Travis does not fail a build if the integration tests fail (merrimanr via cestella) closes apache/incubator-metron#69
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/a7ea7491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/a7ea7491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/a7ea7491
Branch: refs/heads/master
Commit: a7ea749182f5f94f5de99b1bf696fb31feb4daf1
Parents: 9621c55
Author: merrimanr <me...@gmail.com>
Authored: Thu Apr 7 09:11:26 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Thu Apr 7 09:11:26 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 -
.travis.yml | 3 +-
metron-streaming/Metron-DataLoads/pom.xml | 2 +-
.../src/test/resources/log4j.properties | 24 +++++++++++++
.../src/test/resources/log4j2.xml | 31 ++++++++++++++++
.../src/test/resources/logging.properties | 17 +++++++++
.../src/test/resources/log4j.properties | 24 +++++++++++++
.../src/test/resources/log4j2.xml | 31 ++++++++++++++++
.../src/main/resources/log4j.properties | 38 --------------------
.../src/test/resources/log4j.properties | 24 +++++++++++++
.../Metron-Solr/src/test/resources/log4j2.xml | 31 ++++++++++++++++
.../integration/PcapParserIntegrationTest.java | 3 +-
.../src/test/resources/log4j.properties | 24 +++++++++++++
.../src/test/resources/log4j2.xml | 31 ++++++++++++++++
14 files changed, 241 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6434855..307f7d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,4 @@ target
*.classpath
*.settings
*hbase-site.xml
-log4j.properties
*.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8426668..5936787 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
language: java
jdk:
- oraclejdk8
- - openjdk7
script:
- |
mvn apache-rat:check
cd metron-streaming
- mvn -q integration-test package | grep -v "DEBUG\|INFO\|WARN"
+ mvn -q integration-test package
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-DataLoads/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/pom.xml b/metron-streaming/Metron-DataLoads/pom.xml
index 4e7f76b..239881c 100644
--- a/metron-streaming/Metron-DataLoads/pom.xml
+++ b/metron-streaming/Metron-DataLoads/pom.xml
@@ -168,7 +168,7 @@
<version>2.12.4</version>
<configuration>
<!-- Skip the default running of this plug-in (or everything is run twice...see below) -->
- <argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine>
+ <argLine>-Xmx2048m -XX:MaxPermSize=256m -Djava.util.logging.config.file=logging.properties</argLine>
<skip>true</skip>
<!-- Show 100% of the lines from the stack trace (doesn't work) -->
<trimStackTrace>false</trimStackTrace>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-DataLoads/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/test/resources/log4j.properties b/metron-streaming/Metron-DataLoads/src/test/resources/log4j.properties
new file mode 100644
index 0000000..0d50388
--- /dev/null
+++ b/metron-streaming/Metron-DataLoads/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Root logger option
+log4j.rootLogger=ERROR, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-DataLoads/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/test/resources/log4j2.xml b/metron-streaming/Metron-DataLoads/src/test/resources/log4j2.xml
new file mode 100755
index 0000000..68d5eac
--- /dev/null
+++ b/metron-streaming/Metron-DataLoads/src/test/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-DataLoads/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/test/resources/logging.properties b/metron-streaming/Metron-DataLoads/src/test/resources/logging.properties
new file mode 100644
index 0000000..5798db4
--- /dev/null
+++ b/metron-streaming/Metron-DataLoads/src/test/resources/logging.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.level= ERROR
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j.properties b/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j.properties
new file mode 100644
index 0000000..0d50388
--- /dev/null
+++ b/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Root logger option
+log4j.rootLogger=ERROR, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j2.xml b/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j2.xml
new file mode 100755
index 0000000..68d5eac
--- /dev/null
+++ b/metron-streaming/Metron-Elasticsearch/src/test/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Pcap_Service/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/resources/log4j.properties b/metron-streaming/Metron-Pcap_Service/src/main/resources/log4j.properties
deleted file mode 100644
index 64d1b4a..0000000
--- a/metron-streaming/Metron-Pcap_Service/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Root logger option
-log4j.rootLogger=TRACE,file,stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=/var/log/hbase/cisco-hbase.log
-log4j.appender.file.MaxFileSize=1MB
-log4j.appender.file.MaxBackupIndex=1
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-
-# Direct log messages to console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.logger.backtype.storm=DEBUG
-log4j.logger.clojure.tools=DEBUG
-
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Solr/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Solr/src/test/resources/log4j.properties b/metron-streaming/Metron-Solr/src/test/resources/log4j.properties
new file mode 100644
index 0000000..0d50388
--- /dev/null
+++ b/metron-streaming/Metron-Solr/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Root logger option
+log4j.rootLogger=ERROR, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Solr/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Solr/src/test/resources/log4j2.xml b/metron-streaming/Metron-Solr/src/test/resources/log4j2.xml
new file mode 100755
index 0000000..68d5eac
--- /dev/null
+++ b/metron-streaming/Metron-Solr/src/test/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Topologies/src/test/java/org/apache/metron/integration/PcapParserIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/test/java/org/apache/metron/integration/PcapParserIntegrationTest.java b/metron-streaming/Metron-Topologies/src/test/java/org/apache/metron/integration/PcapParserIntegrationTest.java
index 6a220a4..0b8b7f2 100644
--- a/metron-streaming/Metron-Topologies/src/test/java/org/apache/metron/integration/PcapParserIntegrationTest.java
+++ b/metron-streaming/Metron-Topologies/src/test/java/org/apache/metron/integration/PcapParserIntegrationTest.java
@@ -140,7 +140,6 @@ public class PcapParserIntegrationTest extends BaseIntegrationTest {
}};
final KafkaWithZKComponent kafkaComponent = getKafkaComponent(topologyProperties, new ArrayList<KafkaWithZKComponent.Topic>() {{
add(new KafkaWithZKComponent.Topic(kafkaTopic, 1));
- add(new KafkaWithZKComponent.Topic(Constants.ENRICHMENT_TOPIC, 1));
}});
FluxTopologyComponent fluxComponent = new FluxTopologyComponent.Builder()
@@ -203,6 +202,8 @@ public class PcapParserIntegrationTest extends BaseIntegrationTest {
}
Assert.assertEquals(pcapEntries.size(), rowCount);
System.out.println("Ended");
+ } catch (Exception e ) {
+ e.printStackTrace();
} finally {
runner.stop();
clearOutDir(outDir);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Topologies/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/test/resources/log4j.properties b/metron-streaming/Metron-Topologies/src/test/resources/log4j.properties
new file mode 100644
index 0000000..0d50388
--- /dev/null
+++ b/metron-streaming/Metron-Topologies/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Root logger option
+log4j.rootLogger=ERROR, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a7ea7491/metron-streaming/Metron-Topologies/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/test/resources/log4j2.xml b/metron-streaming/Metron-Topologies/src/test/resources/log4j2.xml
new file mode 100755
index 0000000..68d5eac
--- /dev/null
+++ b/metron-streaming/Metron-Topologies/src/test/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration monitorInterval="60">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+</configuration>
+