This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 0b7ee111a4fad4914b488000423a4bf3c49f9be3
Author: seanyinx <sean....@huawei.com>
AuthorDate: Tue Dec 26 19:30:10 2017 +0800
SCB-97 moved docker plugin config to profile
Signed-off-by: seanyinx <sean....@huawei.com>
---
integration-tests/pack-tests/pom.xml | 158 +++++++++++++++++------------------
1 file changed, 77 insertions(+), 81 deletions(-)
diff --git a/integration-tests/pack-tests/pom.xml
b/integration-tests/pack-tests/pom.xml
index 4dea6c3..c567682 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-tests/pom.xml
@@ -96,93 +96,89 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <images>
- <image>
- <name>mysql/mysql-server:5.7</name>
- <alias>mysql</alias>
- <run>
- <env>
- <MYSQL_ROOT_PASSWORD>password</MYSQL_ROOT_PASSWORD>
- <MYSQL_DATABASE>saga</MYSQL_DATABASE>
- <MYSQL_USER>saga</MYSQL_USER>
- <MYSQL_PASSWORD>password</MYSQL_PASSWORD>
- </env>
- <wait>
- <log>Starting MySQL 5.7</log>
- <tcp>
- <ports>
- <port>3306</port>
- </ports>
- </tcp>
- <time>60000</time>
- </wait>
- <ports>
- <port>mysql.port:3306</port>
- </ports>
- </run>
- </image>
- <image>
- <name>alpha-server:${project.version}</name>
- <alias>alpha</alias>
- <run>
- <env>
- <JAVA_OPTS>
- -Dspring.profiles.active=prd
- </JAVA_OPTS>
- </env>
- <links>
- <link>mysql:mysql.servicecomb.io</link>
- </links>
- <wait>
- <log>Started [a-zA-Z]+ in [0-9.]+ seconds</log>
- <tcp>
- <ports>
- <port>8080</port>
- </ports>
- </tcp>
- <time>120000</time>
- </wait>
- <ports>
- <port>alpha.port:8080</port>
- </ports>
- <dependsOn>
- <dependsOn>mysql</dependsOn>
- </dependsOn>
- </run>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>docker</id>
<build>
<plugins>
<plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>mysql/mysql-server:5.7</name>
+ <alias>mysql</alias>
+ <run>
+ <env>
+ <MYSQL_ROOT_PASSWORD>password</MYSQL_ROOT_PASSWORD>
+ <MYSQL_DATABASE>saga</MYSQL_DATABASE>
+ <MYSQL_USER>saga</MYSQL_USER>
+ <MYSQL_PASSWORD>password</MYSQL_PASSWORD>
+ </env>
+ <wait>
+ <log>Starting MySQL 5.7</log>
+ <tcp>
+ <ports>
+ <port>3306</port>
+ </ports>
+ </tcp>
+ <time>60000</time>
+ </wait>
+ <ports>
+ <port>mysql.port:3306</port>
+ </ports>
+ </run>
+ </image>
+ <image>
+ <name>alpha-server:${project.version}</name>
+ <alias>alpha</alias>
+ <run>
+ <env>
+ <JAVA_OPTS>
+ -Dspring.profiles.active=prd
+ </JAVA_OPTS>
+ </env>
+ <links>
+ <link>mysql:mysql.servicecomb.io</link>
+ </links>
+ <wait>
+ <log>Started [a-zA-Z]+ in [0-9.]+ seconds</log>
+ <tcp>
+ <ports>
+ <port>8080</port>
+ </ports>
+ </tcp>
+ <time>120000</time>
+ </wait>
+ <ports>
+ <port>alpha.port:8080</port>
+ </ports>
+ <dependsOn>
+ <dependsOn>mysql</dependsOn>
+ </dependsOn>
+ </run>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<executions>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <commits@servicecomb.apache.org>.
