Build: cut over to the new startup-elasticsearch syntax.

Original commit: elastic/x-pack-elasticsearch@29582a18b9

qa/smoke-test-plugins/integration-tests.xml

@@ -18,64 +18,6 @@
     </sequential>
   </macrodef>
 
-  <!-- FIXME remove this redefinition and fix in core -->
-  <macrodef name="startup-elasticsearch">
-    <attribute name="home" default="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
-    <attribute name="spawn" default="true"/>
-    <attribute name="args" default="${integ.args}"/>
-    <attribute name="es.unicast.enabled" default="false"/>
-    <attribute name="es.unicast.hosts" default=""/>
-    <attribute name="es.cluster.name" default="${integ.cluster.name}"/>
-    <attribute name="es.http.port" default="${integ.http.port}"/>
-    <attribute name="es.transport.tcp.port" default="${integ.transport.port}"/>
-    <attribute name="es.pidfile" default="${integ.pidfile}"/>
-    <attribute name="jvm.args" default="${tests.jvm.argline}"/>
-    <element name="nestedA" optional="true"/>
-    <sequential>
-      <!-- run bin/elasticsearch with args -->
-      <echo>Starting up external cluster...</echo>
-
-      <run-script script="@{home}/bin/elasticsearch"
-                  spawn="@{spawn}">
-        <nested>
-          <env key="JAVA_HOME" value="${java.home}"/>
-          <!-- we pass these as gc options, even if they arent, to avoid conflicting gc options -->
-          <env key="ES_GC_OPTS" value="@{jvm.args}"/>
-          <arg value="-Des.cluster.name=@{es.cluster.name}"/>
-          <arg value="-Des.http.port=@{es.http.port}"/>
-          <arg value="-Des.transport.tcp.port=@{es.transport.tcp.port}"/>
-          <arg value="-Des.pidfile=@{es.pidfile}"/>
-          <arg value="-Des.discovery.zen.ping.unicast.enabled=@{es.unicast.enabled}"/>
-          <arg value="-Des.discovery.zen.ping.unicast.hosts=@{es.unicast.hosts}"/>
-          <arg value="-Des.path.repo=@{home}/repo"/>
-          <arg value="-Des.discovery.zen.ping.multicast.enabled=false"/>
-          <arg value="-Des.script.inline=on"/>
-          <arg value="-Des.script.indexed=on"/>
-          <arg value="-Des.repositories.url.allowed_urls=http://snapshot.test*"/>
-          <nestedA/>
-        </nested>
-      </run-script>
-
-      <!-- wait for startup -->
-      <local name="failed.to.start"/>
-      <waitfor-elasticsearch port="@{es.http.port}"
-                             timeoutproperty="failed.to.start"/>
-
-      <!-- best effort, print console log. useful if it fails especially -->
-      <local name="log.contents"/>
-      <loadfile srcFile="@{home}/logs/@{es.cluster.name}.log"
-                property="log.contents"
-                failonerror="false"/>
-      <echo message="${log.contents}" taskname="elasticsearch"/>
-
-      <fail message="ES instance did not start" if="failed.to.start"/>
-
-      <local name="integ.pid"/>
-      <extract-pid file="@{es.pidfile}" property="integ.pid"/>
-      <echo>External node started PID ${integ.pid}</echo>
-    </sequential>
-  </macrodef>
-
   <target name="start-external-cluster-with-plugins" depends="setup-workspace">
     <ac:for list="${xplugins.list}" param="xplugin.name">
       <sequential>
@@ -126,9 +68,9 @@
     </run-script>
 
     <startup-elasticsearch>
-      <nestedA>
+     <additional-args>
         <arg value="-Des.marvel.agent.exporter.es.hosts=http://marvel_export:changeme@localhost:${integ.http.port}"/>
-      </nestedA>
+      </additional-args>
     </startup-elasticsearch>
 
     <echo>Checking we can connect with basic auth on port ${integ.http.port}...</echo>