Merge pull request #12084 from rmuir/more_robust

make integ testing a bit more picky

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

@@ -11,15 +11,14 @@
       <attribute name="script"/>
       <attribute name="dir"/>
       <attribute name="args"/>
-      <attribute name="spawn"/>
     <sequential>
-      <exec executable="cmd" osfamily="winnt" dir="@{dir}" spawn="@{spawn}">
+      <exec executable="cmd" osfamily="winnt" dir="@{dir}" failonerror="true">
         <arg value="/c"/>
         <arg value="@{dir}/@{script}.bat"/>
         <arg line="@{args}"/>
       </exec>
 
-      <exec executable="sh" osfamily="unix" dir="@{dir}" spawn="@{spawn}">
+      <exec executable="sh" osfamily="unix" dir="@{dir}" failonerror="true">
         <arg value="@{dir}/@{script}"/>
         <arg line="@{args}"/>
       </exec>
@@ -37,13 +36,13 @@
     <property name="integ.home" location="${integ.scratch}/${integ.finalname}"/>
     <property name="integ.repo.home" location="${integ.home}/repo"/>
     <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.script.indexed=on -Des.path.repo=${integ.repo.home}"/>
 
     <!-- execute -->
     <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">
       <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.repo.home" location="${integ.home}/repo"/>
     <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.script.indexed=on -Des.path.repo=${integ.repo.home}"/>
 
     <makeurl property="integ.plugin.url" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
 
     <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 -->
     <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">
       <http url="http://127.0.0.1:9200"/>