build wdt archive dynamically

Author: pfmackin

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -305,6 +305,7 @@ public static ExecResult cleanup() throws Exception {
             + getProjectRoot()
             + "/src/integration-tests/bash/cleanup.sh";
     logger.info("Command to call cleanup script " + cmd);
+
     return ExecCommand.exec(cmd);
   }
 

integration-tests/src/test/java/oracle/kubernetes/operator/ITCoherenceTests.java

@@ -11,7 +11,6 @@
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -28,6 +27,7 @@ public class ITCoherenceTests extends BaseTest {
 
   private static final String PROXY_CLIENT_SCRIPT = "buildRunProxyClient.sh";
   private static final String PROXY_CLIENT_APP_NAME = "coherence-proxy-client";
+  private static final String PROXY_SERVER_APP_NAME = "coherence-proxy-server";
   private static final String OP_CACHE_LOAD = "load";
   private static final String OP_CACHE_VALIDATE = "validate";
   private static final String PROXY_PORT = "9000";
@@ -70,11 +70,13 @@ public void testRollingRestart() throws Exception {
     Assert.assertNotNull(domain);
 
     try {
+      // Build and run the proxy client on the admin VM to load the cache
       copyAndExecuteProxyClientInPod(OP_CACHE_LOAD);
 
       // Do the rolling restart
-      restartDomainByChangingEnvProperty();
+//      restartDomainByChangingEnvProperty();
 
+      // Build and run the proxy client on the admin VM to validate the cache
       copyAndExecuteProxyClientInPod(OP_CACHE_VALIDATE);
     } finally {
       destroyDomain();
@@ -83,7 +85,8 @@ public void testRollingRestart() throws Exception {
   }
 
   /**
-   * Copy the shell script file and all coherence app files over to the admin pod.
+   * Since the coherence.jar is not open source, we need to build the proxy client on the admin VM, which has the
+   * coherence.jar.  Copy the shell script file and all coherence app files over to the admin pod.
    * Then run the script to build the proxy client and run the proxy test.
    *
    * @param cacheOp - cache operation
@@ -133,26 +136,6 @@ private static void copyAndExecuteProxyClientInPod(String cacheOp) {
     }
   }
 
-  /**
-   * Modify the domain scope env property on the domain resource using kubectl apply -f domain.yaml
-   * Verify that all the server pods in the domain got re-started. The property tested is: env:
-   * "-Dweblogic.StdoutDebugEnabled=false"--> "-Dweblogic.StdoutDebugEnabled=true"
-   *
-   * @throws Exception
-   */
-  private void restartDomainByChangingEnvProperty() throws Exception {
-
-    // The default cmd loop sleep is too long and we could miss states like terminating. Change
-    // the
-    // sleep and iterations
-    //
-    setWaitTimePod(2);
-    setMaxIterationsPod(125);
-
-    domain.verifyDomainServerPodRestart(
-        "\"-Dweblogic.StdoutDebugEnabled=false\"", "\"-Dweblogic.StdoutDebugEnabled=true\"");
-  }
-
   /**
    * Create the domain
    *
@@ -161,9 +144,8 @@ private void restartDomainByChangingEnvProperty() throws Exception {
    */
   private Domain createDomain() throws Exception {
 
-// TODO - Don't hardcode the archive location
     Map<String, String> envMap = new HashMap();
-    envMap.put("CUSTOM_WDT_ARCHIVE", "/Users/pmackin/archive-proxy.zip");
+    envMap.put("CUSTOM_WDT_ARCHIVE", buildProxyServerWdtZip());
 
     // create domain
     Domain domain = null;
@@ -192,4 +174,41 @@ private static void destroyDomain() throws Exception {
     }
   }
 
+  /**
+   * Modify the domain scope env property on the domain resource using kubectl apply -f domain.yaml
+   * Verify that all the server pods in the domain got re-started. The property tested is: env:
+   * "-Dweblogic.StdoutDebugEnabled=false"--> "-Dweblogic.StdoutDebugEnabled=true"
+   *
+   * @throws Exception
+   */
+  private void restartDomainByChangingEnvProperty() throws Exception {
+
+    // The default cmd loop sleep is too long and we could miss states like terminating. Change
+    // the
+    // sleep and iterations
+    //
+    setWaitTimePod(2);
+    setMaxIterationsPod(125);
+
+    domain.verifyDomainServerPodRestart(
+        "\"-Dweblogic.StdoutDebugEnabled=false\"", "\"-Dweblogic.StdoutDebugEnabled=true\"");
+  }
+
+  /**
+   * Build the WDT zip that contains the Coherence proxy server
+   *
+   * @return the WDT zip path
+   */
+  private static String buildProxyServerWdtZip() {
+
+    // Build the proxy server gar file
+    String garPath = getResultDir() + "/coh-proxy-server.gar";
+    String cohAppLocationOnHost = BaseTest.getAppLocationOnHost() + "/" + PROXY_SERVER_APP_NAME;
+    TestUtils.buildJarArchive(garPath, cohAppLocationOnHost);
+
+    // Build the WDT zip
+    String wdtArchivePath = getResultDir() + "/coh-wdt-archive.zip";
+    TestUtils.buildWdtZip(wdtArchivePath, new String[] {garPath}, getResultDir());
+    return wdtArchivePath;
+  }
 }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -1078,6 +1078,100 @@ public static String callShellScriptByExecToPod(
     return result.stdout().trim();
   }
 
+  /**
+   * Build a jar archive.  The archive will only include the directory structure below the srcDir.
+   *
+   * @param jarPath  Jar file path for resulting archive
+   * @param srcDir   source directory
+   */
+  public static void buildJarArchive(
+      String jarPath, String srcDir)  {
+
+    try {
+      StringBuffer cmd = new StringBuffer("jar -cf ");
+      cmd
+          .append(jarPath)
+          .append(" -C ")
+          .append(srcDir)
+          .append(" . ")
+      ;
+      logger.info("Command to call build a jar file " + cmd);
+      ExecResult result = ExecCommand.exec(cmd.toString());
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Build a zip archive.  The archive will only include the directory structure below the srcDir.
+   *
+   * @param zipPath  zip file path for resulting archive
+   * @param srcDir   source directory
+   */
+  public static void buildZipArchive(
+      String zipPath, String srcDir)  {
+
+    try {
+      StringBuffer cmd = new StringBuffer();
+      cmd
+          .append("cd ")
+          .append(srcDir)
+          .append(" ; zip -r ")
+          .append(zipPath)
+          .append(" . ")
+      ;
+      logger.info("Command to call build a zip file " + cmd);
+      ExecResult result = ExecCommand.exec(cmd.toString());
+      if (result.exitValue() != 0) {
+        throw new RuntimeException(
+            "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Build a WDT zip archive, which consists of a set of archives structured as follows:
+   *
+   * wlsdeploy/applications/archive1, archive2, etc
+   *
+   * for example, the WDT archive with 3 artifacts could have the following...
+   *
+   *  wlsdeploy/applications/archive1.ear, wlsdeploy/applications/coh-archive.gar, wlsdeploy/applications/mywebapp.war
+   *
+   * Copy each archive to temp location then build the WDT archive
+   *
+   * @param wdtArchivePath path where new archive should be created
+   * @param archivePaths   array of archives to be included in the WDT archive
+   * @param tmpDirRoot     tmp directory that can be used to create the archve
+   */
+  public static void buildWdtZip(
+      String wdtArchivePath, String[] archivePaths, String tmpDirRoot)  {
+
+    try {
+      // Create temp directory strucuture for the WDT archive
+      String archiveRoot = tmpDirRoot + "/wdt-archive-root";
+      String archiveDest = archiveRoot + "/wlsdeploy/applications";
+      File archiveDestDir = new File(archiveDest);
+      archiveDestDir.mkdirs();
+
+      // Copy archives to the dest
+      for (String archivePath: archivePaths) {
+        copyFile(archivePath, archiveDest + "/" + new File(archivePath).getName());
+      }
+
+      // Build the WDT zip
+      buildZipArchive(wdtArchivePath, archiveRoot);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /**
    * exec into the pod and call the shell script with given arguments.
    *

integration-tests/src/test/resources/wdt/coh-wdt-config.yaml

@@ -37,6 +37,6 @@ resources:
 appDeployments:
   Application:
     'coh-proxy-gar-1.0':
-      SourcePath: 'wlsdeploy/applications/coh-proxy-gar-1.0.gar'
+      SourcePath: 'wlsdeploy/applications/coh-proxy-server.gar'
       ModuleType: gar
       Target: '@@PROP:CLUSTER_NAME@@'