Correct for git names used as Docker image tags and cleanup repos where we are deleting the last tag

Author: rjeberhard

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java

@@ -70,6 +70,11 @@ public static String getImageName() {
     String branchName = "";
     if (!BUILD_ID.isEmpty()) {
       branchName = BRANCH_NAME_FROM_JENKINS;
+      // Ensure that the branch name can be used as a part of Docker tag by replacing illegal characters
+      branchName = branchName.codePoints()
+          .map(cp -> Character.isLetterOrDigit(cp) ? cp : '-')
+          .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+          .toString();
     } else  {
       CommandParams params = Command.defaultCommandParams()
           .command("git branch | grep \\* | cut -d ' ' -f2-")

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/ImageBuilders.java

@@ -10,11 +10,15 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import oracle.weblogic.kubernetes.TestConstants;
 import oracle.weblogic.kubernetes.actions.impl.Operator;
 import oracle.weblogic.kubernetes.utils.ExecCommand;
@@ -243,7 +247,65 @@ private void deleteImageOcir(String token, String imageName) {
     }
     if (result != null) {
       logger.info("result.stdout: \n{0}", result.stdout());
+      String stdout = result.stdout();
+      logger.info("result.stdout: \n{0}", stdout);
       logger.info("result.stderr: \n{0}", result.stderr());
+
+      // check if delete was successful and respond if tag couldn't be deleted because there is only one image
+      if (!stdout.isEmpty()) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+          JsonNode root = mapper.readTree(stdout);
+          JsonNode errors = root.path("errors");
+          if (errors != null) {
+            Iterator<JsonNode> it = errors.elements();
+            while (it.hasNext()) {
+              JsonNode entry = it.next();
+              if (entry != null) {
+                JsonNode code = entry.path("code");
+                if (code != null) {
+                  if ("SEMANTIC_VALIDATION_ERROR".equals(code.asText())) {
+                    // The delete of the tag failed because there is only one tag remaining in the
+                    // repository
+                    // Note: there are probably other semantic validation errors, but I don't think
+                    // it's worth
+                    // checking now because our use cases are fairly simple
+
+                    int colonIdx = imageAndTag.indexOf(':');
+                    String repo = imageAndTag.substring(0, colonIdx);
+
+                    // Delete the repository
+                    curlCmd =
+                        "curl -skL -X \"DELETE\" -H \"Authorization: Bearer "
+                            + token
+                            + "\" \"https://"
+                            + registry
+                            + "/20180419/docker/repos/"
+                            + tenancy
+                            + "/"
+                            + repo
+                            + "\"";
+                    logger.info("About to invoke: " + curlCmd);
+                    result = null;
+                    try {
+                      result = ExecCommand.exec(curlCmd, true);
+                    } catch (Exception e) {
+                      logger.info("Got exception while running command: {0}", curlCmd);
+                      logger.info(e.toString());
+                    }
+                    if (result != null) {
+                      logger.info("result.stdout: \n{0}", result.stdout());
+                      logger.info("result.stderr: \n{0}", result.stderr());
+                    }
+                  }
+                }
+              }
+            }
+          }
+        } catch (JsonProcessingException e) {
+          logger.info("Got exception, parsing failed with errors " + e.getMessage());
+        }
+      }
     }
   }