Fix regression with UPDATE where WDT install could not be overwritten

imagetool/src/main/resources/docker-files/Create_Image.mustache

@@ -33,11 +33,13 @@ ENV ORACLE_HOME={{{oracle_home}}} \
 {{/installJava}}
 {{#isWdtEnabled}}
     DOMAIN_HOME={{{domain_home}}} \
+    WDT_HOME={{{wdt_home}}} \
     {{#modelOnly}}
         WDT_MODEL_HOME={{{wdt_model_home}}} \
     {{/modelOnly}}
     {{/isWdtEnabled}}
-    PATH=${PATH}:{{{java_home}}}/bin:{{{oracle_home}}}/oracle_common/common/bin:{{{oracle_home}}}/wlserver/common/bin:{{{oracle_home}}}{{#isWdtEnabled}}:{{{domain_home}}}/bin{{/isWdtEnabled}}
+    PATH=${PATH}:{{{java_home}}}/bin:{{{oracle_home}}}/oracle_common/common/bin:{{{oracle_home}}}/wlserver/common/bin:{{{oracle_home}}}{{#isWdtEnabled}}:{{{domain_home}}}/bin
+{{/isWdtEnabled}}
 
 LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 

imagetool/src/main/resources/docker-files/Update_Image.mustache

@@ -12,7 +12,8 @@ USER root
 ENV OPATCH_NO_FUSER=true
 
 {{#isWdtEnabled}}
-ENV  DOMAIN_HOME={{{domain_home}}} \
+ENV DOMAIN_HOME={{{domain_home}}} \
+    WDT_HOME={{{wdt_home}}} \
     {{#modelOnly}}
         WDT_MODEL_HOME={{{wdt_model_home}}} \
     {{/modelOnly}}

imagetool/src/main/resources/docker-files/run-wdt.mustache

@@ -36,11 +36,12 @@ RUN cd {{{wdt_home}}} \
     {{{.}}}
 {{/beforeWdtCommand}}
 
+RUN test -d {{{wdt_home}}}/weblogic-deploy && rm -rf {{{wdt_home}}}/weblogic-deploy || echo Initial WDT install \
 {{#usingWdtTarGzInstaller}}
-    RUN tar zxf {{{tempDir}}}/{{{wdtInstaller}}} -C {{{wdt_home}}}
+  && tar zxf {{{tempDir}}}/{{{wdtInstaller}}} -C {{{wdt_home}}}
 {{/usingWdtTarGzInstaller}}
 {{^usingWdtTarGzInstaller}}
-    RUN unzip -q {{{tempDir}}}/{{{wdtInstaller}}} -d {{{wdt_home}}}
+  && unzip -q {{{tempDir}}}/{{{wdtInstaller}}} -d {{{wdt_home}}}
 {{/usingWdtTarGzInstaller}}
 
 {{^modelOnly}}

imagetool/src/main/resources/probe-env/inspect-image-long.sh

@@ -37,6 +37,13 @@ if [ -n "$WDT_MODEL_HOME" ]; then
   echo wdtModelHome="$WDT_MODEL_HOME"
 fi
 
+if [ -n "$WDT_HOME" ]; then
+  echo wdtHome="$WDT_HOME"
+  echo wdtVersion="$(cat $WDT_HOME/weblogic-deploy/VERSION.txt | sed 's/.* //')"
+elif [ -f "/u01/wdt/weblogic-deploy/VERSION.txt" ]; then
+  echo wdtHome="/u01/wdt"
+  echo wdtVersion="$(cat /u01/wdt/weblogic-deploy/VERSION.txt | sed 's/.* //')"
+fi
 
 if [ -n "$ORACLE_HOME" ]; then
   echo oracleHome="$ORACLE_HOME"

imagetool/src/main/resources/probe-env/inspect-image.sh

@@ -37,6 +37,13 @@ if [ -n "$WDT_MODEL_HOME" ]; then
   echo wdtModelHome="$WDT_MODEL_HOME"
 fi
 
+if [ -n "$WDT_HOME" ]; then
+  echo wdtHome="$WDT_HOME"
+  echo wdtVersion="$(cat $WDT_HOME/weblogic-deploy/VERSION.txt | sed 's/.* //')"
+elif [ -f "/u01/wdt/weblogic-deploy/VERSION.txt" ]; then
+  echo wdtHome="/u01/wdt"
+  echo wdtVersion="$(cat /u01/wdt/weblogic-deploy/VERSION.txt | sed 's/.* //')"
+fi
 
 if [ -n "$ORACLE_HOME" ]; then
   echo oracleHome="$ORACLE_HOME"

tests/src/test/java/com/oracle/weblogic/imagetool/tests/ITImagetool.java

@@ -264,6 +264,28 @@ private static String getMethodName(TestInfo testInfo) {
 
     }
 
+    private static CommandResult executeAndVerify(String command) throws Exception {
+        logger.info("Executing command: " + command);
+        CommandResult result = Runner.run(command);
+        assertEquals(0, result.exitValue(), "for command: " + command);
+        logger.info(result.stdout());
+        return result;
+    }
+
+    /**
+     * Determine if a Docker image exists on the local system.
+    */
+    private static boolean imageExists(String imageTag) throws IOException, InterruptedException {
+        return !getImageId(imageTag).isEmpty();
+    }
+
+    /**
+     * Get the docker identifier for this image tag.
+     */
+    private static String getImageId(String imageTag) throws IOException, InterruptedException {
+        return Runner.run("docker images -q " + imageTag).stdout().trim();
+    }
+
     private void verifyFileInImage(String imagename, String filename, String expectedContent) throws Exception {
         logger.info("verifying the file content in image");
         String command = "docker run --rm " + imagename + " bash -c 'cat " + filename + "'";
@@ -289,14 +311,6 @@ private void createDBContainer() throws Exception {
         checkCmdInLoop(command);
     }
 
-    private static CommandResult executeAndVerify(String command) throws Exception {
-        logger.info("Executing command: " + command);
-        CommandResult result = Runner.run(command);
-        assertEquals(0, result.exitValue(), "for command: " + command);
-        logger.info(result.stdout());
-        return result;
-    }
-
     /**
      * Test caching of an installer of type JDK.
      *
@@ -538,8 +552,8 @@ void createWlsImg(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
+
             wlsImgBuilt = true;
         }
     }
@@ -568,8 +582,8 @@ void updateWlsImg(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
+
             // TODO should check that patch and OPatch were applied
         }
     }
@@ -603,8 +617,8 @@ void createWlsImgUsingWdt(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
+
             domainImgBuilt = true;
         }
     }
@@ -633,8 +647,7 @@ void rebaseWlsImg(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -688,8 +701,7 @@ void createFmwImgFullInternetAccess(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -744,8 +756,7 @@ void createJrfDomainImgUsingWdt(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -784,8 +795,7 @@ void createRestrictedJrfDomainImgUsingWdt(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -821,8 +831,7 @@ void createWlsImgUsingMultiModels(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -851,8 +860,7 @@ void createWlsImgWithAdditionalBuildCommands(TestInfo testInfo) throws Exception
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
 
         // verify the file created in [before-jdk-install] section
@@ -891,8 +899,7 @@ void createImageWithServerJRE(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -919,8 +926,7 @@ void updateImageWithServerJRE(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
         }
     }
 
@@ -962,8 +968,7 @@ void createMiiOl8slim(TestInfo testInfo) throws Exception {
             assertEquals(0, result.exitValue(), "for command: " + command);
 
             // verify the docker image is created
-            String imageId = Runner.run("docker images -q " + tagName, out, logger).stdout().trim();
-            assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
 
             validateDirectoryPermissions("/u01/domains", "drwxrwxr-x", tagName, out);
             validateDirectoryPermissions("/u01/wdt", "drwxrwxr-x", tagName, out);
@@ -991,4 +996,68 @@ private void validateDirectoryPermissions(String directory, String expected, Str
         // When running on an SELinux host, the permissions shown by ls will end with a "."
         assertTrue(tokens[0].startsWith(expected), "Incorrect directory permissions for " + directory);
     }
+
+    /**
+     * update a WLS image with a model.
+     *
+     * @throws Exception - if any error occurs
+     */
+    @Test
+    @Order(28)
+    @Tag("nightly")
+    @DisplayName("Use Update to add a WDT model to createWlsImg")
+    void updateAddModel(TestInfo testInfo) throws Exception {
+        assumeTrue(wlsImgBuilt);
+
+        String tagName = build_tag + ":" + getMethodName(testInfo);
+        String command = new UpdateCommand()
+            .fromImage(build_tag + ":createWlsImg") //from step 10, createWlsImg()
+            .tag(tagName)
+            .wdtVersion(WDT_VERSION)
+            .wdtModel(WDT_MODEL)
+            .wdtVariables(WDT_VARIABLES)
+            .wdtArchive(WDT_ARCHIVE)
+            .wdtModelOnly(true)
+            .build();
+
+        try (PrintWriter out = getTestMethodWriter(testInfo)) {
+            CommandResult result = Runner.run(command, out, logger);
+            assertEquals(0, result.exitValue(), "for command: " + command);
+
+            // verify the docker image is created
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
+        }
+    }
+
+    /**
+     * update a WLS image with another model.
+     *
+     * @throws Exception - if any error occurs
+     */
+    @Test
+    @Order(29)
+    @Tag("nightly")
+    @DisplayName("Use Update to add a second WDT model to createWlsImg")
+    void updateAddSecondModel(TestInfo testInfo) throws Exception {
+        String testFromImage = build_tag + ":updateAddModel";
+        // skip this test if updateAddModel() failed to create an image
+        assumeTrue(imageExists(testFromImage));
+
+        String tagName = build_tag + ":" + getMethodName(testInfo);
+        String command = new UpdateCommand()
+            .fromImage(testFromImage)
+            .tag(tagName)
+            .wdtVersion(WDT_VERSION)
+            .wdtModel(WDT_MODEL2)
+            .wdtModelOnly(true)
+            .build();
+
+        try (PrintWriter out = getTestMethodWriter(testInfo)) {
+            CommandResult result = Runner.run(command, out, logger);
+            assertEquals(0, result.exitValue(), "for command: " + command);
+
+            // verify the docker image is created
+            assertTrue(imageExists(tagName), "Image was not created: " + tagName);
+        }
+    }
 }

tests/src/test/java/com/oracle/weblogic/imagetool/tests/utils/UpdateCommand.java

@@ -3,12 +3,23 @@
 
 package com.oracle.weblogic.imagetool.tests.utils;
 
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public class UpdateCommand extends ImageToolCommand {
 
     private String fromImage;
     private String tag;
     private String patches;
 
+    // WDT flags
+    private String wdtVersion;
+    private String wdtModel;
+    private String wdtArchive;
+    private String wdtVariables;
+    private boolean wdtModelOnly;
+
     public UpdateCommand() {
         super("update");
     }
@@ -23,15 +34,36 @@ public UpdateCommand tag(String value) {
         return this;
     }
 
-    public UpdateCommand tag(String name, String version) {
-        return tag(name + ":" + version);
-    }
-
     public UpdateCommand patches(String... values) {
         patches = String.join(",", values);
         return this;
     }
 
+    public UpdateCommand wdtVersion(String value) {
+        wdtVersion = value;
+        return this;
+    }
+
+    public UpdateCommand wdtModel(Path... values) {
+        wdtModel = Arrays.stream(values).map(Path::toString).collect(Collectors.joining(","));
+        return this;
+    }
+
+    public UpdateCommand wdtArchive(Path value) {
+        wdtArchive = value.toString();
+        return this;
+    }
+
+    public UpdateCommand wdtVariables(Path value) {
+        wdtVariables = value.toString();
+        return this;
+    }
+
+    public UpdateCommand wdtModelOnly(boolean value) {
+        wdtModelOnly = value;
+        return this;
+    }
+
     /**
      * Generate the command using the provided command line options.
      * @return the imagetool command as a string suitable for running in ProcessBuilder
@@ -40,6 +72,11 @@ public String build() {
         return super.build()
             + field("--fromImage", fromImage)
             + field("--tag", tag)
-            + field("--patches", patches);
+            + field("--patches", patches)
+            + field("--wdtVersion", wdtVersion)
+            + field("--wdtModel", wdtModel)
+            + field("--wdtArchive", wdtArchive)
+            + field("--wdtVariables", wdtVariables)
+            + field("--wdtModelOnly", wdtModelOnly);
     }
 }