[WFLY-245] Disable execution of x-site tests; update server instance …

…names to use wildfly base name.
sgilda · May 13, 2013 · ed0c4f6 · ed0c4f6
1 parent aeeaf9d
commit ed0c4f6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/testsuite/integration/clust/pom.xml b/testsuite/integration/clust/pom.xml
@@ -442,7 +442,7 @@
                             <!-- Single node clustering tests. -->
                             <execution>
                                 <id>ts.surefire.clust.xsite</id>
-                                <phase>test</phase>
+                                <phase>none</phase>
                                 <goals><goal>test</goal></goals>
                                 <configuration>
                                     <!-- Tests to execute. -->

diff --git a/testsuite/integration/src/test/scripts/clustering-build.xml b/testsuite/integration/src/test/scripts/clustering-build.xml
@@ -97,61 +97,61 @@
 
         <!-- site A, node 0, mcast 0 -->
         <echo message="Building config clustering-xsite-${siteA}-0"/>
-        <copy todir="target/jbossas-clustering-xsite-${siteA}-0" overwrite="true">
+        <copy todir="target/wildfly-clustering-xsite-${siteA}-0" overwrite="true">
             <fileset dir="${basedir}/target/jbossas"/>
         </copy>
-        <ts.config-as.ip-with-multicast name="jbossas-clustering-xsite-${siteA}-0" node="${node0}" mcast="${mcast0}"/>
-        <ts.config-as.add-port-offset name="jbossas-clustering-xsite-${siteA}-0"/>
+        <ts.config-as.ip-with-multicast name="wildfly-clustering-xsite-${siteA}-0" node="${node0}" mcast="${mcast0}"/>
+        <ts.config-as.add-port-offset name="wildfly-clustering-xsite-${siteA}-0"/>
         <!-- define relay at JGroups level -->
-        <ts.config-as.copy-stack name="jbossas-clustering-xsite-${siteA}-0" stack.name="udp-xsite" stack.base="udp"/>
-        <ts.config-as.add-xsite-relay name="jbossas-clustering-xsite-${siteA}-0" stack="udp-xsite" relay.site="siteA"
+        <ts.config-as.copy-stack name="wildfly-clustering-xsite-${siteA}-0" stack.name="udp-xsite" stack.base="udp"/>
+        <ts.config-as.add-xsite-relay name="wildfly-clustering-xsite-${siteA}-0" stack="udp-xsite" relay.site="siteA"
                                       remote-site.site="siteB" remote-site.stack="tcp" remote-site.cluster="bridge"/>
         <!-- define cache-container backups at Infinispan level -->
-        <ts.config-as.copy-cache-container name="jbossas-clustering-xsite-${siteA}-0" container.name="xsite-container"
+        <ts.config-as.copy-cache-container name="wildfly-clustering-xsite-${siteA}-0" container.name="xsite-container"
                                            container.base="web" container.default-cache="repl"/>
-        <ts.config-as.add-xsite-backup name="jbossas-clustering-xsite-${siteA}-0" container="xsite-container"
+        <ts.config-as.add-xsite-backup name="wildfly-clustering-xsite-${siteA}-0" container="xsite-container"
                                            cache-type="replicated-cache" cache="repl" backup.site="siteB"/>
 
 
         <!-- site A, node 1, mcast 0 -->
         <echo message="Building config clustering-xsite-${siteA}-1"/>
-        <copy todir="target/jbossas-clustering-xsite-${siteA}-1" overwrite="true">
+        <copy todir="target/wildfly-clustering-xsite-${siteA}-1" overwrite="true">
             <fileset dir="${basedir}/target/jbossas"/>
         </copy>
-        <ts.config-as.ip-with-multicast name="jbossas-clustering-xsite-${siteA}-1" node="${node1}" mcast="${mcast0}"/>
-        <ts.config-as.add-port-offset name="jbossas-clustering-xsite-${siteA}-1" offset="100" nativePort="9999" httpPort="9990"/>
-        <ts.config-as.copy-stack name="jbossas-clustering-xsite-${siteA}-1" stack.name="udp-xsite" stack.base="udp"/>
+        <ts.config-as.ip-with-multicast name="wildfly-clustering-xsite-${siteA}-1" node="${node1}" mcast="${mcast0}"/>
+        <ts.config-as.add-port-offset name="wildfly-clustering-xsite-${siteA}-1" offset="100" nativePort="9999" httpPort="9990"/>
+        <ts.config-as.copy-stack name="wildfly-clustering-xsite-${siteA}-1" stack.name="udp-xsite" stack.base="udp"/>
         <!-- define relay at JGroups level -->
-        <ts.config-as.add-xsite-relay name="jbossas-clustering-xsite-${siteA}-1" stack="udp-xsite" relay.site="siteA"
+        <ts.config-as.add-xsite-relay name="wildfly-clustering-xsite-${siteA}-1" stack="udp-xsite" relay.site="siteA"
                                       remote-site.site="siteB" remote-site.stack="tcp" remote-site.cluster="bridge"/>
         <!-- define cache-container backups at Infinispan level -->
-        <ts.config-as.copy-cache-container name="jbossas-clustering-xsite-${siteA}-1" container.name="xsite-container"
+        <ts.config-as.copy-cache-container name="wildfly-clustering-xsite-${siteA}-1" container.name="xsite-container"
                                            container.base="web" container.default-cache="repl"/>
-        <ts.config-as.add-xsite-backup name="jbossas-clustering-xsite-${siteA}-1" container="xsite-container"
+        <ts.config-as.add-xsite-backup name="wildfly-clustering-xsite-${siteA}-1" container="xsite-container"
                                            cache-type="replicated-cache" cache="repl" backup.site="siteB"/>
 
         <!-- site B, node 2, mcast 1 -->
         <echo message="Building config clustering-xsite-${siteB}-0"/>
-        <copy todir="target/jbossas-clustering-xsite-${siteB}-0" overwrite="true">
+        <copy todir="target/wildfly-clustering-xsite-${siteB}-0" overwrite="true">
             <fileset dir="${basedir}/target/jbossas"/>
         </copy>
-        <ts.config-as.ip-with-multicast name="jbossas-clustering-xsite-${siteB}-0" node="${node2}" mcast="${mcast1}"/>
-        <ts.config-as.add-port-offset name="jbossas-clustering-xsite-${siteB}-0" offset="200" nativePort="9999" httpPort="9990"/>
+        <ts.config-as.ip-with-multicast name="wildfly-clustering-xsite-${siteB}-0" node="${node2}" mcast="${mcast1}"/>
+        <ts.config-as.add-port-offset name="wildfly-clustering-xsite-${siteB}-0" offset="200" nativePort="9999" httpPort="9990"/>
         <!-- define relay at JGroups level -->
-        <ts.config-as.copy-stack name="jbossas-clustering-xsite-${siteB}-0" stack.name="udp-xsite" stack.base="udp"/>
-        <ts.config-as.add-xsite-relay name="jbossas-clustering-xsite-${siteB}-0" stack="udp-xsite" relay.site="siteB"
+        <ts.config-as.copy-stack name="wildfly-clustering-xsite-${siteB}-0" stack.name="udp-xsite" stack.base="udp"/>
+        <ts.config-as.add-xsite-relay name="wildfly-clustering-xsite-${siteB}-0" stack="udp-xsite" relay.site="siteB"
                                       remote-site.site="siteA" remote-site.stack="tcp" remote-site.cluster="bridge"/>
 
         <!-- site B, node 3, mcast 1 -->
         <echo message="Building config clustering-xsite-${siteB}-1"/>
-        <copy todir="target/jbossas-clustering-xsite-${siteB}-1" overwrite="true">
+        <copy todir="target/wildfly-clustering-xsite-${siteB}-1" overwrite="true">
             <fileset dir="${basedir}/target/jbossas"/>
         </copy>
-        <ts.config-as.ip-with-multicast name="jbossas-clustering-xsite-${siteB}-1" node="${node3}" mcast="${mcast1}"/>
-        <ts.config-as.add-port-offset name="jbossas-clustering-xsite-${siteB}-1" offset="300" nativePort="9999" httpPort="9990"/>
+        <ts.config-as.ip-with-multicast name="wildfly-clustering-xsite-${siteB}-1" node="${node3}" mcast="${mcast1}"/>
+        <ts.config-as.add-port-offset name="wildfly-clustering-xsite-${siteB}-1" offset="300" nativePort="9999" httpPort="9990"/>
         <!-- define relay at JGroups level -->
-        <ts.config-as.copy-stack name="jbossas-clustering-xsite-${siteB}-1" stack.name="udp-xsite" stack.base="udp"/>
-        <ts.config-as.add-xsite-relay name="jbossas-clustering-xsite-${siteB}-1" stack="udp-xsite" relay.site="siteB"
+        <ts.config-as.copy-stack name="wildfly-clustering-xsite-${siteB}-1" stack.name="udp-xsite" stack.base="udp"/>
+        <ts.config-as.add-xsite-relay name="wildfly-clustering-xsite-${siteB}-1" stack="udp-xsite" relay.site="siteB"
                                       remote-site.site="siteA" remote-site.stack="tcp" remote-site.cluster="bridge"/>
 
     </target>

diff --git a/testsuite/integration/src/test/scripts/clustering-common-targets.xml b/testsuite/integration/src/test/scripts/clustering-common-targets.xml
@@ -28,7 +28,7 @@
     -->
     <macrodef name="ts.config-as.change-transport-stack" description="Change default transport stack in clustering server profiles.">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -51,7 +51,7 @@
     -->
     <macrodef name="ts.config-as.change-cache-mode" description="Change default cache mode in clustering server profiles.">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -85,7 +85,7 @@
     -->
     <macrodef name="ts.config-as.add-cache-container" description="Add a cache container to the Infinispan subsystem">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -108,7 +108,7 @@
     -->
     <macrodef name="ts.config-as.copy-cache-container" description="Make a copy of a cache container in the Infinispan subsystem">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -135,7 +135,7 @@
     -->
     <macrodef name="ts.config-as.copy-stack" description="Make a copy of a stack in the JGroups subsystem">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -160,7 +160,7 @@
     -->
     <macrodef name="ts.config-as.add-xsite-relay" description="Add a relay layer to a stack in the JGroups subsystem">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -191,7 +191,7 @@
     -->
     <macrodef name="ts.config-as.add-xsite-backup" description="Add a backup element to a cache in the Infinispan subsystem">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>
 
@@ -227,7 +227,7 @@
     -->
     <macrodef name="execute-xslt-transform" description="Execute an XSLT transform on an xml file (in place)">
 
-        <attribute name="name" default="jbossas"/>
+        <attribute name="name" default="wildfly"/>
         <attribute name="output.dir" default="${project.build.directory}"/>
         <attribute name="config.dir.name" default="standalone/configuration"/>