Don't use port 9200/9300 for integration tests
This commit is contained in:
parent
18cb9eb2ec
commit
cf6fe6cdcd
|
@ -16,6 +16,7 @@
|
|||
<property name="integ.args"
|
||||
value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release
|
||||
-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*"/>
|
||||
|
||||
<!-- runs an OS script -->
|
||||
|
@ -122,7 +123,7 @@
|
|||
args="@{args} -Des.path.repo=@{home}/repo" />
|
||||
|
||||
<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>
|
||||
|
||||
<local name="integ.pid"/>
|
||||
|
|
|
@ -167,7 +167,7 @@
|
|||
<parallelism>1</parallelism>
|
||||
<systemProperties>
|
||||
<!-- use external cluster -->
|
||||
<tests.cluster>127.0.0.1:9300</tests.cluster>
|
||||
<tests.cluster>127.0.0.1:${integ.transport.port}</tests.cluster>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
@ -60,7 +60,11 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<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>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
@ -411,7 +411,7 @@
|
|||
<parallelism>1</parallelism>
|
||||
<systemProperties>
|
||||
<!-- use external cluster -->
|
||||
<tests.cluster>127.0.0.1:9300</tests.cluster>
|
||||
<tests.cluster>127.0.0.1:${integ.transport.port}</tests.cluster>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -109,6 +109,8 @@
|
|||
<integ.scratch>${project.build.directory}/integ-tests</integ.scratch>
|
||||
<integ.deps>${project.build.directory}/integ-deps</integ.deps>
|
||||
<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>
|
||||
</properties>
|
||||
|
||||
|
|
Loading…
Reference in New Issue