honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use port 9200/9300 for integration tests

Browse Source
This commit is contained in:
Robert Muir 2015-08-04 09:25:44 -04:00
parent 18cb9eb2ec
commit cf6fe6cdcd
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-tools/src/main/resources/ant/integration-tests.xml
View File

@ -16,6 +16,7 @@
<property name="integ.args" <property name="integ.args"
value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release
-Des.discovery.zen.ping.multicast.enabled=false -Des.script.inline=on -Des.discovery.zen.ping.multicast.enabled=false -Des.script.inline=on
-Des.http.port=${integ.http.port} -Des.transport.tcp.port=${integ.transport.port}
-Des.script.indexed=on -Des.pidfile=${integ.pidfile} -Des.repositories.url.allowed_urls=http://snapshot.test*"/> -Des.script.indexed=on -Des.pidfile=${integ.pidfile} -Des.repositories.url.allowed_urls=http://snapshot.test*"/>
<!-- runs an OS script --> <!-- runs an OS script -->
@ -122,7 +123,7 @@
args="@{args} -Des.path.repo=@{home}/repo" /> args="@{args} -Des.path.repo=@{home}/repo" />
<waitfor maxwait="3" maxwaitunit="minute" checkevery="500"> <waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
<http url="http://127.0.0.1:9200"/> <http url="http://127.0.0.1:${integ.http.port}"/>
</waitfor> </waitfor>
<local name="integ.pid"/> <local name="integ.pid"/>

2
distribution/pom.xml
View File

@ -167,7 +167,7 @@
<parallelism>1</parallelism> <parallelism>1</parallelism>
<systemProperties> <systemProperties>
<!-- use external cluster --> <!-- use external cluster -->
<tests.cluster>127.0.0.1:9300</tests.cluster> <tests.cluster>127.0.0.1:${integ.transport.port}</tests.cluster>
</systemProperties> </systemProperties>
</configuration> </configuration>
</execution> </execution>

6
distribution/zip/pom.xml
View File

@ -60,7 +60,11 @@
</goals> </goals>
<configuration> <configuration>
<target if="${run}"> <target if="${run}">
<ant antfile="${elasticsearch.integ.antfile}" target="start-foreground"/> <!-- use conventional port numbers -->
<ant antfile="${elasticsearch.integ.antfile}" target="start-foreground">
<property name="integ.http.port" value="9200"/>
<property name="integ.transport.port" value="9300"/>
</ant>
</target> </target>
</configuration> </configuration>
</execution> </execution>

2
plugins/pom.xml
View File

@ -411,7 +411,7 @@
<parallelism>1</parallelism> <parallelism>1</parallelism>
<systemProperties> <systemProperties>
<!-- use external cluster --> <!-- use external cluster -->
<tests.cluster>127.0.0.1:9300</tests.cluster> <tests.cluster>127.0.0.1:${integ.transport.port}</tests.cluster>
</systemProperties> </systemProperties>
</configuration> </configuration>
</execution> </execution>

2
pom.xml
View File

@ -109,6 +109,8 @@
<integ.scratch>${project.build.directory}/integ-tests</integ.scratch> <integ.scratch>${project.build.directory}/integ-tests</integ.scratch>
<integ.deps>${project.build.directory}/integ-deps</integ.deps> <integ.deps>${project.build.directory}/integ-deps</integ.deps>
<integ.temp>${integ.scratch}/temp</integ.temp> <integ.temp>${integ.scratch}/temp</integ.temp>
<integ.http.port>9400</integ.http.port>
<integ.transport.port>9500</integ.transport.port>
<no.commit.pattern>\bno(n|)commit\b</no.commit.pattern> <no.commit.pattern>\bno(n|)commit\b</no.commit.pattern>
</properties> </properties>