brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [41/50] [abbrv] brooklyn-server git commit: Removed references to AMP and QA framework
Date Thu, 29 Jun 2017 15:36:23 GMT
Removed references to AMP and QA framework


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/975807b8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/975807b8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/975807b8

Branch: refs/heads/master
Commit: 975807b89df63833d9b53b50d508cb5d782ad7b0
Parents: 61eb736
Author: Andrew Donald Kennedy <andrew.kennedy@cloudsoftcorp.com>
Authored: Wed May 31 10:52:08 2017 +0100
Committer: Andrew Donald Kennedy <andrew.kennedy@cloudsoftcorp.com>
Committed: Wed May 31 10:52:08 2017 +0100

----------------------------------------------------------------------
 brooklyn-server/locations/container/pom.xml     |  6 ++--
 .../location/kubernetes/KubernetesLocation.java |  8 ++---
 .../kubernetes/KubernetesLocationConfig.java    |  4 +--
 .../location/openshift/OpenShiftLocation.java   |  2 +-
 .../docker/DockerJcloudsLocationLiveTest.java   | 10 +++---
 .../kubernetes/KubernetesLocationLiveTest.java  | 11 +++---
 .../KubernetesLocationYamlLiveTest.java         | 10 ++----
 .../openshift/OpenShiftLocationLiveTest.java    | 25 +++++++-------
 .../OpenShiftLocationYamlLiveTest.java          | 36 ++++----------------
 9 files changed, 39 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/pom.xml b/brooklyn-server/locations/container/pom.xml
index 1e12a98..b5dd506 100644
--- a/brooklyn-server/locations/container/pom.xml
+++ b/brooklyn-server/locations/container/pom.xml
@@ -54,8 +54,8 @@
         </dependency>
 
         <!--
-            Expect AMP to exclude this, and to choose its own jclouds-docker version.
-            So if this version is not kept up-to-date then it won't impact AMP.
+            Expect Brooklyn to exclude this, and to choose its own jclouds-docker version.
+            So if this version is not kept up-to-date then it won't impact Brooklyn.
         -->
         <dependency>
             <groupId>${jclouds.groupId}.api</groupId>
@@ -150,4 +150,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
index 65973d9..dfde551 100644
--- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
+++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java
@@ -143,8 +143,8 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi
     public static final String NODE_PORT = "NodePort";
     public static final String IMMUTABLE_CONTAINER_KEY = "immutable-container";
     public static final String SSHABLE_CONTAINER = "sshable-container";
-    public static final String CLOUDSOFT_ENTITY_ID = "cloudsoft.io/entity-id";
-    public static final String CLOUDSOFT_APPLICATION_ID = "cloudsoft.io/application-id";
+    public static final String BROOKLYN_ENTITY_ID = "brooklyn.apache.org/entity-id";
+    public static final String BROOKLYN_APPLICATION_ID = "brooklyn.apache.org/application-id";
     public static final String KUBERNETES_DOCKERCFG = "kubernetes.io/dockercfg";
     public static final String PHASE_AVAILABLE = "Available";
     public static final String PHASE_TERMINATING = "Terminating";
@@ -712,8 +712,8 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi
         Deployment deployment = new DeploymentBuilder()
                 .withNewMetadata()
                 .withName(deploymentName)
-                .addToAnnotations(CLOUDSOFT_ENTITY_ID, entity.getId())
-                .addToAnnotations(CLOUDSOFT_APPLICATION_ID, entity.getApplicationId())
+                .addToAnnotations(BROOKLYN_ENTITY_ID, entity.getId())
+                .addToAnnotations(BROOKLYN_APPLICATION_ID, entity.getApplicationId())
                 .endMetadata()
                 .withNewSpec()
                 .withReplicas(replicas)

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java
b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java
index 7fa5665..771827e 100644
--- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java
+++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java
@@ -117,8 +117,8 @@ public interface KubernetesLocationConfig extends CloudLocationConfig
{
 
     ConfigKey<String> NAMESPACE = ConfigKeys.builder(String.class)
             .name("namespace")
-            .description("Namespace where resources will live; the default is 'amp'")
-            .defaultValue("amp")
+            .description("Namespace where resources will live; the default is 'brooklyn'")
+            .defaultValue("brooklyn")
             .constraint(Predicates.<String>notNull())
             .build();
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java
b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java
index 72aad8c..bcd8a07 100644
--- a/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java
+++ b/brooklyn-server/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java
@@ -199,7 +199,7 @@ public class OpenShiftLocation extends KubernetesLocation implements OpenShiftLo
         DeploymentConfig deployment = new DeploymentConfigBuilder()
                 .withNewMetadata()
                 .withName(deploymentName)
-                .addToAnnotations(OPENSHIFT_GENERATED_BY, "AMP")
+                .addToAnnotations(OPENSHIFT_GENERATED_BY, "Apache Brooklyn")
                 .addToAnnotations(CLOUDSOFT_ENTITY_ID, entity.getId())
                 .addToAnnotations(CLOUDSOFT_APPLICATION_ID, entity.getApplicationId())
                 .endMetadata()

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java
b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java
index 45f39b2..dcb3324 100644
--- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java
+++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java
@@ -50,8 +50,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static org.testng.Assert.*;
 
 /**
- * TODO For these tests to pass, they need on the classpath the patch file(s) from AMP.
- * <p>
  * Assumes that a pre-existing swarm endpoint is available. See system properties and the
defaults
  * below.
  */
@@ -59,10 +57,10 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport
{
 
     private static final Logger LOG = LoggerFactory.getLogger(DockerJcloudsLocationLiveTest.class);
 
-    private static final String SWARM_ENDPOINT = System.getProperty("test.amp.docker.swarmEndpoint",
"https://10.104.0.162:3376/");
-    private static final String IDENTITY_FILE_PATH = System.getProperty("test.amp.docker.identity",
Os.tidyPath("~/.docker/.certs/cert.pem"));
-    private static final String CREDENTIAL_FILE_PATH = System.getProperty("test.amp.docker.credential",
Os.tidyPath("~/.docker/.certs/key.pem"));
-    private static final String SWARM_NETWORK_NAME = System.getProperty("test.amp.docker.networkName",
Os.tidyPath("brooklyn"));
+    private static final String SWARM_ENDPOINT = System.getProperty("test.brooklyn-container-service.docker.swarmEndpoint",
"https://10.104.0.162:3376/");
+    private static final String IDENTITY_FILE_PATH = System.getProperty("test.brooklyn-container-service.docker.identity",
Os.tidyPath("~/.docker/.certs/cert.pem"));
+    private static final String CREDENTIAL_FILE_PATH = System.getProperty("test.brooklyn-container-service.docker.credential",
Os.tidyPath("~/.docker/.certs/key.pem"));
+    private static final String SWARM_NETWORK_NAME = System.getProperty("test.brooklyn-container-service.docker.networkName",
Os.tidyPath("brooklyn"));
 
     protected DockerJcloudsLocation loc;
     protected List<MachineLocation> machines;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java
b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java
index f16fa3e..6a30650 100644
--- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java
+++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java
@@ -51,16 +51,13 @@ import static org.testng.Assert.*;
  * after that (because assumes the existence of a kubernetes endpoint). It needs configured
with
  * something like:
  * <p>
- * {@code -Dtest.amp.kubernetes.endpoint=http://10.104.2.206:8080}).
- * <p>
- * The QA Framework is more important for that - hence these tests (trying to be) kept simple
- * and focused.
+ * {@code -Dtest.brooklyn-container-service.kubernetes.endpoint=http://10.104.2.206:8080}
  */
 public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport {
 
-    public static final String KUBERNETES_ENDPOINT = System.getProperty("test.amp.kubernetes.endpoint",
"");
-    public static final String IDENTITY = System.getProperty("test.amp.kubernetes.identity",
"");
-    public static final String CREDENTIAL = System.getProperty("test.amp.kubernetes.credential",
"");
+    public static final String KUBERNETES_ENDPOINT = System.getProperty("test.brooklyn-container-service.kubernetes.endpoint",
"");
+    public static final String IDENTITY = System.getProperty("test.brooklyn-container-service.kubernetes.identity",
"");
+    public static final String CREDENTIAL = System.getProperty("test.brooklyn-container-service.kubernetes.credential",
"");
     private static final Logger LOG = LoggerFactory.getLogger(KubernetesLocationLiveTest.class);
     protected KubernetesLocation loc;
     protected List<KubernetesMachineLocation> machines;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java
b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java
index f67d91f..f8b2645 100644
--- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java
+++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java
@@ -65,10 +65,7 @@ import static org.testng.Assert.assertTrue;
  * after that (because assumes the existence of a kubernetes endpoint). It needs configured
with
  * something like:
  * <p>
- * {@code -Dtest.amp.kubernetes.endpoint=http://10.104.2.206:8080}).
- * <p>
- * The QA Framework is more important for that - hence these tests (trying to be) kept simple
- * and focused.
+ * {@code -Dtest.brooklyn-container-service.kubernetes.endpoint=http://10.104.2.206:8080}
  */
 public class KubernetesLocationYamlLiveTest extends AbstractYamlTest {
 
@@ -383,12 +380,12 @@ public class KubernetesLocationYamlLiveTest extends AbstractYamlTest
{
 
         String mysqlPublicPort = assertAttributeEventuallyNonNull(mysql, Sensors.newStringSensor("docker.port.3306.mapped.public"));
         assertReachableEventually(HostAndPort.fromString(mysqlPublicPort));
-        assertAttributeEquals(mysql, KubernetesPod.KUBERNETES_NAMESPACE, "amp");
+        assertAttributeEquals(mysql, KubernetesPod.KUBERNETES_NAMESPACE, "brooklyn");
         assertAttributeEquals(mysql, KubernetesPod.KUBERNETES_SERVICE, "wordpress-mysql-"
+ randomId);
 
         String wordpressPublicPort = assertAttributeEventuallyNonNull(wordpress, Sensors.newStringSensor("docker.port.80.mapped.public"));
         assertReachableEventually(HostAndPort.fromString(wordpressPublicPort));
-        assertAttributeEquals(wordpress, KubernetesPod.KUBERNETES_NAMESPACE, "amp");
+        assertAttributeEquals(wordpress, KubernetesPod.KUBERNETES_NAMESPACE, "brooklyn");
         assertAttributeEquals(wordpress, KubernetesPod.KUBERNETES_SERVICE, "wordpress-" +
randomId);
 
         // TODO more assertions (e.g. wordpress can successfully reach the database)
@@ -412,7 +409,6 @@ public class KubernetesLocationYamlLiveTest extends AbstractYamlTest {
         checkPod(app, KubernetesPod.class);
     }
 
-    /* Test disabled as QA framework AMP does not have catalog entries deployed yet */
     @Test(groups = {"Live"}, enabled = false)
     public void testPodCatalogEntry() throws Exception {
         String yaml = Joiner.on("\n").join(

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java
b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java
index 08bdbd1..0606f68 100644
--- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java
+++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java
@@ -27,26 +27,25 @@ import org.slf4j.LoggerFactory;
 import java.util.Map;
 
 /**
- * Tests deploying containers via the {@code openshift"} location, to an OpenShift endpoint.
+ * Tests deploying containers via the {@code openshift} location, to an OpenShift endpoint.
  * By extending {@link KubernetesLocationLiveTest}, we get all the k8s tests.
  * <p>
  * It needs configured with something like:
  * <p>
- * <pre>
- * {@code
- * -Dtest.amp.openshift.endpoint=https://192.168.99.100:8443/
- * -Dtest.amp.openshift.certsBaseDir=~/repos/grkvlt/40bdf09b09d5896e19a9d287f41d39bb
- * }
- * </pre>
+ * <pre>{@code
+ * -Dtest.brooklyn-container-service.openshift.endpoint=https://192.168.99.100:8443/
+ * -Dtest.brooklyn-container-service.openshift.certsBaseDir=~/repos/grkvlt/40bdf09b09d5896e19a9d287f41d39bb
+ * }</pre>
  */
 public class OpenShiftLocationLiveTest extends KubernetesLocationLiveTest {
 
-    public static final String OPENSHIFT_ENDPOINT = System.getProperty("test.amp.openshift.endpoint",
"");
-    public static final String CERTS_BASE_DIR = System.getProperty("test.amp.openshift.certsBaseDir",
Os.mergePaths(System.getProperty("user.home"), "openshift-certs"));
-    public static final String CA_CERT_FILE = System.getProperty("test.amp.openshift.caCert",
Os.mergePaths(CERTS_BASE_DIR, "ca.crt"));
-    public static final String CLIENT_CERT_FILE = System.getProperty("test.amp.openshift.clientCert",
Os.mergePaths(CERTS_BASE_DIR, "admin.crt"));
-    public static final String CLIENT_KEY_FILE = System.getProperty("test.amp.openshift.clientKey",
Os.mergePaths(CERTS_BASE_DIR, "admin.key"));
-    public static final String NAMESPACE = System.getProperty("test.amp.openshift.namespace",
"");
+    public static final String OPENSHIFT_ENDPOINT = System.getProperty("test.brooklyn-container-service.openshift.endpoint",
"");
+    public static final String CERTS_BASE_DIR = System.getProperty("test.brooklyn-container-service.openshift.certsBaseDir",
Os.mergePaths(System.getProperty("user.home"), "openshift-certs"));
+    public static final String CA_CERT_FILE = System.getProperty("test.brooklyn-container-service.openshift.caCert",
Os.mergePaths(CERTS_BASE_DIR, "ca.crt"));
+    public static final String CLIENT_CERT_FILE = System.getProperty("test.brooklyn-container-service.openshift.clientCert",
Os.mergePaths(CERTS_BASE_DIR, "admin.crt"));
+    public static final String CLIENT_KEY_FILE = System.getProperty("test.brooklyn-container-service.openshift.clientKey",
Os.mergePaths(CERTS_BASE_DIR, "admin.key"));
+    public static final String NAMESPACE = System.getProperty("test.brooklyn-container-service.openshift.namespace",
"");
+
     @SuppressWarnings("unused")
     private static final Logger LOG = LoggerFactory.getLogger(OpenShiftLocationLiveTest.class);
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/975807b8/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java
b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java
index fce4fe0..fae87de 100644
--- a/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java
+++ b/brooklyn-server/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java
@@ -29,41 +29,19 @@ import org.testng.annotations.Test;
 import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.*;
 
 /**
- * Tests YAML apps via the {@code openshift"} location, to an OpenShift endpoint.
+ * Tests YAML apps via the {@code openshift} location, to an OpenShift endpoint.
  * By extending {@link KubernetesLocationYamlLiveTest}, we get all the k8s tests.
  * <p>
  * It needs configured with something like:
  * <p>
- * <pre>
- * {@code
- * -Dtest.amp.openshift.endpoint=https://master.example.com:8443/
- * -Dtest.amp.openshift.certsBaseDir=/Users/aled/repos/grkvlt/40bdf09b09d5896e19a9d287f41d39bb
- * -Dtest.amp.openshift.namespace=test
- * }
- * </pre>
+ * <pre>{@code
+ * -Dtest.brooklyn-container-service.openshift.endpoint=https://master.example.com:8443/
+ * -Dtest.brooklyn-container-service.openshift.certsBaseDir=/Users/aled/repos/grkvlt/40bdf09b09d5896e19a9d287f41d39bb
+ * -Dtest.brooklyn-container-service.openshift.namespace=test
+ * }</pre>
  */
 public class OpenShiftLocationYamlLiveTest extends KubernetesLocationYamlLiveTest {
 
-    // TODO testTomcatContainer seems flaky on the OpenShift deployed at 10.101.1.139, 
-    // when using node2.
-    //
-    // The container's log shows it takes 355 seconds to deploy the default web application

-    // directory /usr/local/tomcat/webapps/ROOT:
-    //    24-Nov-2016 22:04:11.906 INFO [main] org.apache.catalina.core.StandardEngine.startInternal
Starting Servlet Engine: Apache Tomcat/8.0.39
-    //    24-Nov-2016 22:04:11.940 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deploying web application directory /usr/local/tomcat/webapps/ROOT
-    //    24-Nov-2016 22:10:07.093 INFO [localhost-startStop-1] org.apache.catalina.util.SessionIdGeneratorBase.createSecureRandom
Creation of SecureRandom instance for session ID generation using [SHA1PRNG] took [354,156]
milliseconds.
-    //    24-Nov-2016 22:10:07.123 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deployment of web application directory /usr/local/tomcat/webapps/ROOT has finished in 355,183
ms
-    //    24-Nov-2016 22:10:07.133 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deploying web application directory /usr/local/tomcat/webapps/docs
-    //    24-Nov-2016 22:10:07.172 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deployment of web application directory /usr/local/tomcat/webapps/docs has finished in 40
ms
-    //    24-Nov-2016 22:10:07.173 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deploying web application directory /usr/local/tomcat/webapps/examples
-    //    24-Nov-2016 22:10:08.051 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deployment of web application directory /usr/local/tomcat/webapps/examples has finished in
878 ms
-    //    24-Nov-2016 22:10:08.052 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deploying web application directory /usr/local/tomcat/webapps/host-manager
-    //    24-Nov-2016 22:10:08.104 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deployment of web application directory /usr/local/tomcat/webapps/host-manager has finished
in 52 ms
-    //    24-Nov-2016 22:10:08.104 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deploying web application directory /usr/local/tomcat/webapps/manager
-    //    24-Nov-2016 22:10:08.159 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployDirectory
Deployment of web application directory /usr/local/tomcat/webapps/manager has finished in
55 ms
-    //
-    // With node1, it takes only 6 seconds to deploy the we app.
-
     @BeforeMethod(alwaysRun = true)
     @Override
     public void setUp() throws Exception {
@@ -112,7 +90,6 @@ public class OpenShiftLocationYamlLiveTest extends KubernetesLocationYamlLiveTes
         checkPod(app, OpenShiftPod.class);
     }
 
-    /* Test disabled as QA framework AMP does not have catalog entries deployed yet */
     @Test(groups = {"Live"}, enabled = false)
     public void testOpenShiftPodCatalogEntry() throws Exception {
         String yaml = Joiner.on("\n").join(
@@ -146,7 +123,6 @@ public class OpenShiftLocationYamlLiveTest extends KubernetesLocationYamlLiveTes
         checkNginxResource(app, OpenShiftResource.class);
     }
 
-    /* Test disabled as QA framework AMP does not have catalog entries deployed yet */
     @Test(groups = {"Live"}, enabled = false)
     public void testNginxOpenShiftResourceCatalogEntry() throws Exception {
         String yaml = Joiner.on("\n").join(


Mime
View raw message