Merge pull request #62 from jfdenise/xp6-tests

Add back XP tests

Author: jfdenise

builder-image/tests/features/xp.feature

@@ -1,7 +1,6 @@
 @xp5
 @jboss-eap-8
 @jboss-eap-8-tech-preview
-@ignore
 Feature: Openshift XP tests
 
   Scenario: Check that the legacy default config provisioned using galleon plugin works fine
@@ -37,13 +36,12 @@ Scenario: Check that trimmed server provisioned using galleon plugin works fine
     Then XML file /opt/server/standalone/configuration/standalone.xml should contain value /home/jboss on XPath //*[local-name()='config-source' and @name='config-map']/*[local-name()='dir']/@path
     Then XML file /opt/server/standalone/configuration/standalone.xml should contain value 99 on XPath //*[local-name()='config-source' and @name='config-map']/@ordinal
 
-@ignore 
 Scenario: Check with env based legacy configuration
    Given s2i build http://github.com/openshift/openshift-jee-sample from . using master
    | variable                 | value           |
    | GALLEON_PROVISION_LAYERS | cloud-server, microprofile-config |
    | GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap.xp:wildfly-galleon-pack,org.jboss.eap.xp.cloud:eap-xp-cloud-galleon-pack |
-   | GALLEON_PROVISION_CHANNELS | org.jboss.eap.channels:eap-8.1,org.jboss.eap.channels:eap-xp-5.0 |  
+   | GALLEON_PROVISION_CHANNELS | org.jboss.eap.channels:eap-8.1,org.jboss.eap.channels:eap-xp-6.0 |  
    Then container log should contain Running jboss-eap-8-tech-preview/
    Then exactly 2 times container log should contain WFLYSRV0025:
 

test/xp/test-app-default-config/pom.xml

@@ -60,7 +60,7 @@
                                 <channel>
                                     <manifest>
                                         <groupId>org.jboss.eap.channels</groupId>
-                                        <artifactId>eap-xp-5.0</artifactId>
+                                        <artifactId>eap-xp-6.0</artifactId>
                                     </manifest>
                                 </channel>
                             </channels>

test/xp/test-app/pom.xml

@@ -58,7 +58,7 @@
                                 <channel>
                                     <manifest>
                                         <groupId>org.jboss.eap.channels</groupId>
-                                        <artifactId>eap-xp-5.0</artifactId>
+                                        <artifactId>eap-xp-6.0</artifactId>
                                     </manifest>
                                 </channel>
                             </channels>