honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make integ testing a bit more picky

This commit is contained in:
Robert Muir 2015-07-07 10:21:40 -04:00
parent d732c0d19f
commit 023cb0b174
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,15 +11,14 @@
<attribute name="script"/> <attribute name="script"/>
<attribute name="dir"/> <attribute name="dir"/>
<attribute name="args"/> <attribute name="args"/>
<attribute name="spawn"/>
<sequential> <sequential>
<exec executable="cmd" osfamily="winnt" dir="@{dir}" spawn="@{spawn}"> <exec executable="cmd" osfamily="winnt" dir="@{dir}" failonerror="true">
<arg value="/c"/> <arg value="/c"/>
<arg value="@{dir}/@{script}.bat"/> <arg value="@{dir}/@{script}.bat"/>
<arg line="@{args}"/> <arg line="@{args}"/>
</exec> </exec>
<exec executable="sh" osfamily="unix" dir="@{dir}" spawn="@{spawn}"> <exec executable="sh" osfamily="unix" dir="@{dir}" failonerror="true">
<arg value="@{dir}/@{script}"/> <arg value="@{dir}/@{script}"/>
<arg line="@{args}"/> <arg line="@{args}"/>
</exec> </exec>
@ -37,13 +36,13 @@
<property name="integ.home" location="${integ.scratch}/${integ.finalname}"/> <property name="integ.home" location="${integ.scratch}/${integ.finalname}"/>
<property name="integ.repo.home" location="${integ.home}/repo"/> <property name="integ.repo.home" location="${integ.home}/repo"/>
<property name="integ.args" <property name="integ.args"
value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release value="-d -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.script.indexed=on -Des.path.repo=${integ.repo.home}"/> -Des.script.indexed=on -Des.path.repo=${integ.repo.home}"/>
<!-- execute --> <!-- execute -->
<echo>Starting up external cluster...</echo> <echo>Starting up external cluster...</echo>
<run-script dir="${integ.home}" script="bin/elasticsearch" args="${integ.args}" spawn="true"/> <run-script dir="${integ.home}" script="bin/elasticsearch" args="${integ.args}"/>
<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:9200"/>
@ -62,18 +61,18 @@
<property name="integ.home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/> <property name="integ.home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
<property name="integ.repo.home" location="${integ.home}/repo"/> <property name="integ.repo.home" location="${integ.home}/repo"/>
<property name="integ.args" <property name="integ.args"
value="-Des.node.name=smoke_tester -Des.cluster.name=prepare_release value="-d -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.script.indexed=on -Des.path.repo=${integ.repo.home}"/> -Des.script.indexed=on -Des.path.repo=${integ.repo.home}"/>
<makeurl property="integ.plugin.url" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/> <makeurl property="integ.plugin.url" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
<echo>Installing plugin ${project.artifactId}...</echo> <echo>Installing plugin ${project.artifactId}...</echo>
<run-script dir="${integ.home}" script="bin/plugin" args="-u ${integ.plugin.url} -i ${project.artifactId}/${project.version}" spawn="false"/> <run-script dir="${integ.home}" script="bin/plugin" args="-u ${integ.plugin.url} -i ${project.artifactId}/${project.version}"/>
<!-- execute --> <!-- execute -->
<echo>Starting up external cluster...</echo> <echo>Starting up external cluster...</echo>
<run-script dir="${integ.home}" script="bin/elasticsearch" args="${integ.args}" spawn="true"/> <run-script dir="${integ.home}" script="bin/elasticsearch" args="${integ.args}"/>
<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:9200"/>