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 6c2d58e Issue #1752: Etcd docker based tests are running on wrong
jobs on CI
6c2d58e is described below
commit 6c2d58ef059ad64d36c71b205061c2d6aefaab35
Author: Qi Wang <42832902+codingwan...@users.noreply.github.com>
AuthorDate: Tue Oct 30 09:53:19 2018 +0800
Issue #1752: Etcd docker based tests are running on wrong jobs on CI
Descriptions of the changes in this PR:
*Motivation*
Fixes #1752
Etcd metadata driver is using testcontainer to run Etcd in containers for
integration tests.
However this job is running as part normal build, which can cause container
image being deleted
due to concurrent builds.
*Changes*
Move etcd metadata driver tests to be as part of `integrationTests`
Master Issue: #1752
Reviewers: Enrico Olivelli <eolive...@gmail.com>, Sijie Guo
<si...@apache.org>
This closes #1766 from codingwangqi/move_etcd_to_integration_tests, closes
#1752
---
...ob_bookkeeper_precommit_integrationtests.groovy | 9 ++
.test-infra/scripts/pre-docker-tests.sh | 1 +
metadata-drivers/etcd/pom.xml | 121 ++++++++++++---------
3 files changed, 81 insertions(+), 50 deletions(-)
diff --git
a/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
b/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
index 10958ee..7a169cb 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
@@ -60,6 +60,15 @@ freeStyleJob('bookkeeper_precommit_integrationtests') {
properties(skipTests: true, interactiveMode: false)
}
+ // Run metadata driver tests
+ maven {
+ // Set Maven parameters.
+ common_job_properties.setMavenConfig(delegate)
+ rootPOM('metadata-drivers/pom.xml')
+ goals('-B test -DintegrationTests')
+ }
+
+ // Run all integration tests
maven {
// Set Maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/scripts/pre-docker-tests.sh
b/.test-infra/scripts/pre-docker-tests.sh
index 3e92513..1edb48c 100755
--- a/.test-infra/scripts/pre-docker-tests.sh
+++ b/.test-infra/scripts/pre-docker-tests.sh
@@ -29,3 +29,4 @@ docker system prune -f
# clean up any dangling networks from previous runs
docker network prune -f --filter name=testnetwork_*
docker system events > docker.debug-info & echo $! > docker-log.pid
+docker pull quay.io/coreos/etcd:v3.3
diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml
index 0d9e0dd..8e3b339 100644
--- a/metadata-drivers/etcd/pom.xml
+++ b/metadata-drivers/etcd/pom.xml
@@ -18,55 +18,76 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.bookkeeper.metadata.drivers</groupId>
- <artifactId>metadata-drivers-parent</artifactId>
- <version>4.9.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.bookkeeper.metadata.drivers</groupId>
- <artifactId>metadata-stores-etcd</artifactId>
- <name>Apache BookKeeper :: Metadata Drivers:: Etcd</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.coreos</groupId>
- <artifactId>jetcd-core</artifactId>
- <version>${etcd.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>metadata-drivers-parent</artifactId>
+ <version>4.9.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.bookkeeper.metadata.drivers</groupId>
+ <artifactId>metadata-stores-etcd</artifactId>
+ <name>Apache BookKeeper :: Metadata Drivers:: Etcd</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.coreos</groupId>
+ <artifactId>jetcd-core</artifactId>
+ <version>${etcd.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>integrationTests</id>
+ <activation>
+ <property>
+ <name>integrationTests</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
