asef

JanusGraph · Mar 6, 2017 · 50dd37d · 50dd37d
1 parent 309de04
commit 50dd37d
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ target/
 /log/
 /output/
 /scripts/
-/codepipelines-ci/dependency-reduced-pom.xml
+/janusgraph-codepipelines-ci/dependency-reduced-pom.xml
 # When executing tests in alphabetical order, Maven generates temporary
 # files with names like this:
 #

diff --git a/codepipelines-ci/README.md → janusgraph-codepipelines-ci/README.md b/codepipelines-ci/README.md → janusgraph-codepipelines-ci/README.md
diff --git a/codepipelines-ci/pipe.json → janusgraph-codepipelines-ci/pipe.json b/codepipelines-ci/pipe.json → janusgraph-codepipelines-ci/pipe.json
diff --git a/codepipelines-ci/pom.xml → janusgraph-codepipelines-ci/pom.xml b/codepipelines-ci/pom.xml → janusgraph-codepipelines-ci/pom.xml
@@ -69,6 +69,12 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.janusgraph</groupId>
+            <artifactId>janusgraph-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>

diff --git a/...aph/codepipelines/AwsCodePipelinesCi.java → ...aph/codepipelines/AwsCodePipelinesCi.java b/...aph/codepipelines/AwsCodePipelinesCi.java → ...aph/codepipelines/AwsCodePipelinesCi.java
diff --git a/janusgraph-codepipelines-ci/src/test/java/org/janusgraph/codepipelines/TestContainerOne.java b/janusgraph-codepipelines-ci/src/test/java/org/janusgraph/codepipelines/TestContainerOne.java
@@ -0,0 +1,29 @@
+package org.janusgraph.codepipelines;
+
+import org.junit.Test;
+
+/**
+ * Created by amcp on 2017/02/24.
+ */
+public class TestContainerOne {
+    public static class TraversalAlpha {
+        @Test
+        public void testOne() {
+            //noop
+        }
+        @Test
+        public void testTwo() {
+            //noop
+        }
+    }
+    public static class TraversalBeta {
+        @Test
+        public void testOne() {
+            //noop
+        }
+        @Test
+        public void testTwo() {
+            //noop
+        }
+    }
+}
diff --git a/janusgraph-codepipelines-ci/src/test/java/org/janusgraph/codepipelines/TestContainerTwo.java b/janusgraph-codepipelines-ci/src/test/java/org/janusgraph/codepipelines/TestContainerTwo.java
@@ -0,0 +1,29 @@
+package org.janusgraph.codepipelines;
+
+import org.junit.Test;
+
+/**
+ * Created by amcp on 2017/02/24.
+ */
+public class TestContainerTwo {
+    public static class TraversalAlpha {
+        @Test
+        public void testOne() {
+            //noop
+        }
+        @Test
+        public void testTwo() {
+            //noop
+        }
+    }
+    public static class TraversalBeta {
+        @Test
+        public void testOne() {
+            //noop
+        }
+        @Test
+        public void testTwo() {
+            //noop
+        }
+    }
+}
diff --git a/janusgraph-codepipelines-ci/src/test/resources/excludes b/janusgraph-codepipelines-ci/src/test/resources/excludes
@@ -0,0 +1 @@
+**/*.java*
diff --git a/janusgraph-codepipelines-ci/src/test/resources/longTests1 b/janusgraph-codepipelines-ci/src/test/resources/longTests1
@@ -0,0 +1,2 @@
+**/*TestContainerTwo$TraversalBeta*
+**/*TestContainerTwo$TraversalAlpha*
diff --git a/janusgraph-codepipelines-ci/src/test/resources/longTests2 b/janusgraph-codepipelines-ci/src/test/resources/longTests2
@@ -0,0 +1 @@
+**/*TestContainerTwo$TraversalAlpha*
diff --git a/codepipelines-ci/tp-pipe.json → janusgraph-codepipelines-ci/tp-pipe.json b/codepipelines-ci/tp-pipe.json → janusgraph-codepipelines-ci/tp-pipe.json
diff --git a/pom.xml b/pom.xml
@@ -114,10 +114,14 @@
         <top.level.basedir>${basedir}</top.level.basedir>
         <compiler.source>1.8</compiler.source>
         <compiler.target>1.8</compiler.target>
+        <test.pipelines.excludes></test.pipelines.excludes>
+        <test.pipelines.includes></test.pipelines.includes>
+        <test.skip.pipelines>true</test.skip.pipelines>
         <test.excluded.groups>org.janusgraph.testcategory.MemoryTests,org.janusgraph.testcategory.PerformanceTests,org.janusgraph.testcategory.BrittleTests</test.excluded.groups>
         <dependency.locations.enabled>false</dependency.locations.enabled>
     </properties>
     <modules>
+        <module>janusgraph-codepipelines-ci</module>
         <module>janusgraph-core</module>
         <module>janusgraph-test</module>
         <module>janusgraph-berkeleyje</module>
@@ -276,6 +280,7 @@
                             <exclude>**/*ProcessPerformanceTest.java</exclude>
                             <exclude>**/*StructureTest.java</exclude>
                         </excludes>
+
                         <excludedGroups>${test.excluded.groups}</excludedGroups>
                         <skip>${test.skip.default}</skip>
                         <!-- Use log4j.properties from module test resources -->
@@ -307,16 +312,39 @@
                                     <include>**/*StructureTest.java</include>
                                 </includes>
                                 <runOrder>alphabetical</runOrder>
-                                <!-- <excludes>
-                                    <exclude>**/*</exclude>
-                                </excludes> -->
                                 <skipTests>${test.skip.tp}</skipTests>
                                 <systemPropertyVariables>
                                   <build.dir>${project.build.directory}</build.dir>
                                   <log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration>
                                 </systemPropertyVariables>
                             </configuration>
-                       </execution>
+                        </execution>
+                        <execution>
+                            <id>codepipelines</id>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <phase>test</phase>
+                            <configuration combine.self="override">
+                                <reuseForks>false</reuseForks>
+                                <forkCount>1</forkCount>
+                                <parallel>none</parallel>
+                                <threadCount>1</threadCount>
+                                <perCoreThreadCount>false</perCoreThreadCount>
+                                <includes>
+                                    <include>${test.pipelines.includes}</include>
+                                </includes>
+                                <runOrder>alphabetical</runOrder>
+                                <excludes>
+                                    <exclude>${test.pipelines.excludes}</exclude>
+                                </excludes>
+                                <skipTests>${test.skip.pipelines}</skipTests>
+                                <systemPropertyVariables>
+                                    <build.dir>${project.build.directory}</build.dir>
+                                    <log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration>
+                                </systemPropertyVariables>
+                            </configuration>
+                        </execution>
                     </executions>
                 </plugin>
                 <plugin>