replace find command in Jenkinsfile (#227)

Author: ddsharpe

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

@@ -207,7 +207,7 @@ RUN cd {{{tempDir}}}/opatch \
         -domain_type {{domainType}} \
         {{{wdtVariableFileArgument}}} {{{wdtModelFileArgument}}} {{{wdtArchiveFileArgument}}} \
         && rm -rf {{{wdt_home}}}/weblogic-deploy/logs \
-        && find {{{wdt_home}}}/weblogic-deploy/lib/python -name "*.class" -exec rm  {} \;
+        && shopt -s globstar && rm -f {{{wdt_home}}}/weblogic-deploy/lib/python/**/*.class
     {{/isWdtValidateEnabled}}
 
     {{#afterWdtCommand}}

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

@@ -72,7 +72,7 @@
         -domain_type {{domainType}} \
         {{{wdtVariableFileArgument}}} {{{wdtModelFileArgument}}} {{{wdtArchiveFileArgument}}} \
         && rm -rf {{{wdt_home}}}/weblogic-deploy/logs \
-        && find {{{wdt_home}}}/weblogic-deploy/lib/python -name "*.class" -exec rm  {} \;
+        && shopt -s globstar && rm -f {{{wdt_home}}}/weblogic-deploy/lib/python/**/*.class
     {{/isWdtValidateEnabled}}
 
     {{#afterWdtCommand}}

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

@@ -937,4 +937,49 @@ void updateImageWithServerJRE(TestInfo testInfo) throws Exception {
             assertFalse(imageId.isEmpty(), "Image was not created: " + tagName);
         }
     }
+
+    /**
+     * Create an image with WDT Model only on OL 8-slim
+     *
+     * @throws Exception - if any error occurs
+     */
+    @Test
+    @Order(28)
+    @Tag("nightly")
+    @DisplayName("Create Model in Image with OL 8-slim")
+    void createMiiOl8slim(TestInfo testInfo) throws Exception {
+        // test assumes that WDT installer is already in the cache from previous test
+
+        // test assumes that the WLS 12.2.1.3 installer is already in the cache
+
+        // test assumes that the default JDK version 8u202 is already in the cache
+
+        // test assumes that the WDT archive was already constructed
+
+        Path tmpWdtModel = Paths.get(wlsImgBldDir, WDT_MODEL1);
+
+        // update wdt model file
+        Files.copy(WDT_RESOURCES.resolve(WDT_MODEL1), tmpWdtModel, StandardCopyOption.REPLACE_EXISTING);
+
+        try (PrintWriter out = getTestMethodWriter(testInfo)) {
+            String tagName = build_tag + ":" + getMethodName(testInfo);
+            String command = new CreateCommand()
+                .tag(tagName)
+                .fromImage(" oraclelinux", "8-slim")
+                .version(WLS_VERSION)
+                .wdtVersion(WDT_VERSION)
+                .wdtArchive(WDT_ARCHIVE)
+                .wdtModel(tmpWdtModel)
+                .wdtModelOnly(true)
+                .type("wls")
+                .build();
+
+            CommandResult result = Runner.run(command, out, logger);
+            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);
+        }
+    }
 }

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

@@ -29,6 +29,7 @@ public class CreateCommand extends ImageToolCommand {
     private String wdtDomainHome;
     private String wdtDomainType;
     private boolean wdtRunRcu;
+    private boolean wdtModelOnly;
 
     public CreateCommand() {
         super("create");
@@ -129,6 +130,11 @@ public CreateCommand wdtRunRcu(boolean value) {
         return this;
     }
 
+    public CreateCommand 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
@@ -152,6 +158,7 @@ public String build() {
             + field("--wdtVariables", wdtVariables)
             + field("--wdtDomainHome", wdtDomainHome)
             + field("--wdtDomainType", wdtDomainType)
-            + field("--wdtRunRCU", wdtRunRcu);
+            + field("--wdtRunRCU", wdtRunRcu)
+            + field("--wdtModelOnly", wdtModelOnly);
     }
 }