This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 2edd68f Arquillian topologies module
2edd68f is described below
commit 2edd68f5a55168a26b96b8ad993303d5a0be4757
Author: Ivan Kelly <[email protected]>
AuthorDate: Mon Jan 22 08:59:06 2018 +0800
Arquillian topologies module
Will allow topologies to be shared among modules, which is important
as arquillian builds and pulls down the containers on a per
module/suite basis.
Currently contains a single topology, which is 3 BK nodes and 1 ZK
nodes. The BK nodes contain all released versions, with no version
started by default.
Master Issue: #903
Author: Ivan Kelly <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Sijie Guo
<[email protected]>
This closes #1023 from ivankelly/topologies
---
tests/integration-tests-base/pom.xml | 6 ++
.../pom.xml | 45 +--------------
.../3-node-all-version-unstarted.yaml | 64 ++++++++++++++++++++++
tests/pom.xml | 1 +
4 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/tests/integration-tests-base/pom.xml
b/tests/integration-tests-base/pom.xml
index f55569a..450ec64 100644
--- a/tests/integration-tests-base/pom.xml
+++ b/tests/integration-tests-base/pom.xml
@@ -42,6 +42,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.bookkeeper.tests</groupId>
+ <artifactId>integration-tests-topologies</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-standalone</artifactId>
<version>1.1.14.Final</version>
diff --git a/tests/integration-tests-base/pom.xml
b/tests/integration-tests-topologies/pom.xml
similarity index 51%
copy from tests/integration-tests-base/pom.xml
copy to tests/integration-tests-topologies/pom.xml
index f55569a..0127409 100644
--- a/tests/integration-tests-base/pom.xml
+++ b/tests/integration-tests-topologies/pom.xml
@@ -28,48 +28,9 @@
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base</artifactId>
- <packaging>pom</packaging>
+ <artifactId>integration-tests-topologies</artifactId>
+ <packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Base module for Arquillian based
integration tests</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-standalone</artifactId>
- <version>1.1.14.Final</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <currentVersion>${project.version}</currentVersion>
-
<maven.buildDirectory>${project.build.directory}</maven.buildDirectory>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <name>Apache BookKeeper :: Tests :: Common topologies for Arquillian based
integration tests</name>
</project>
diff --git
a/tests/integration-tests-topologies/src/main/resources/cube-definitions/3-node-all-version-unstarted.yaml
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/3-node-all-version-unstarted.yaml
new file mode 100644
index 0000000..a98a322
--- /dev/null
+++
b/tests/integration-tests-topologies/src/main/resources/cube-definitions/3-node-all-version-unstarted.yaml
@@ -0,0 +1,64 @@
+#/**
+# * Copyright 2007 The Apache Software Foundation
+# *
+# * 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.
+# */
+networks:
+ testnetwork*:
+ driver: bridge
+
+zookeeper*:
+ image: zookeeper:3.4.11
+ await:
+ strategy: org.apache.bookkeeper.tests.ZooKeeperAwaitStrategy
+ aliases:
+ - zookeeper
+ beforeStop:
+ - customBeforeStopAction:
+ strategy: org.apache.bookkeeper.tests.LogToTargetDirStopAction
+ networkMode: testnetwork*
+
+bookkeeper1*:
+ image: apachebookkeeper/bookkeeper-all-versions
+ await:
+ strategy: org.apache.bookkeeper.tests.NoopAwaitStrategy
+ env: [BK_ZKCONNECTSTRING=zookeeper]
+ beforeStop:
+ - customBeforeStopAction:
+ strategy:
org.apache.bookkeeper.tests.BookKeeperLogsToTargetDirStopAction
+ networkMode: testnetwork*
+
+bookkeeper2*:
+ image: apachebookkeeper/bookkeeper-all-versions
+ await:
+ strategy: org.apache.bookkeeper.tests.NoopAwaitStrategy
+ env: [BK_ZKCONNECTSTRING=zookeeper]
+ beforeStop:
+ - customBeforeStopAction:
+ strategy:
org.apache.bookkeeper.tests.BookKeeperLogsToTargetDirStopAction
+ networkMode: testnetwork*
+
+bookkeeper3*:
+ image: apachebookkeeper/bookkeeper-all-versions
+ await:
+ strategy: org.apache.bookkeeper.tests.NoopAwaitStrategy
+ env: [BK_ZKCONNECTSTRING=zookeeper]
+ beforeStop:
+ - customBeforeStopAction:
+ strategy:
org.apache.bookkeeper.tests.BookKeeperLogsToTargetDirStopAction
+ networkMode: testnetwork*
+
diff --git a/tests/pom.xml b/tests/pom.xml
index 67c791f..daa2fc7 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -39,6 +39,7 @@
<module>integration-tests-base</module>
<module>integration-tests-base-groovy</module>
<module>integration-tests-utils</module>
+ <module>integration-tests-topologies</module>
</modules>
<build>
<plugins>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
