fix testCreateDomainWithStartPolicyAdminOnly and push domain image to ocir

Author: vanajamukkara

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

@@ -220,6 +220,9 @@ public static void initialize(String appPropsFile) throws Exception {
         "Env var IMAGE_PULL_SECRET_OPERATOR " + System.getenv("IMAGE_PULL_SECRET_OPERATOR"));
     logger.info(
         "Env var IMAGE_PULL_SECRET_WEBLOGIC " + System.getenv("IMAGE_PULL_SECRET_WEBLOGIC"));
+    logger.info("Env var IMAGE_NAME_WEBLOGIC " + System.getenv("IMAGE_NAME_WEBLOGIC"));
+    logger.info("Env var IMAGE_TAG_WEBLOGIC " + System.getenv("IMAGE_TAG_WEBLOGIC"));
+
     logger.info("Env var BRANCH_NAME " + System.getenv("BRANCH_NAME"));
   }
 

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

@@ -451,7 +451,14 @@ public void testDomainInImageUsingWLST() throws Exception {
     Domain domain = null;
     boolean testCompletedSuccessfully = false;
     try {
-      domain = TestUtils.createDomain(DOMAININIMAGE_WLST_YAML);
+
+      Map<String, Object> domainMap = TestUtils.loadYaml(DOMAININIMAGE_WLST_YAML);
+      if (SHARED_CLUSTER) {
+        domainMap.put(
+            "image", System.getenv("REPO_REGISTRY") + "/weblogick8s/domain-home-in-image:12.2.1.3");
+        domainMap.put("imagePullSecretName", "ocir-domain");
+      }
+      domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();
 
       testBasicUseCases(domain);
@@ -483,7 +490,13 @@ public void testDomainInImageUsingWDT() throws Exception {
     Domain domain = null;
     boolean testCompletedSuccessfully = false;
     try {
-      domain = TestUtils.createDomain(DOMAININIMAGE_WDT_YAML);
+      Map<String, Object> domainMap = TestUtils.loadYaml(DOMAININIMAGE_WDT_YAML);
+      if (SHARED_CLUSTER) {
+        domainMap.put(
+            "image", System.getenv("REPO_REGISTRY") + "/weblogick8s/domain-home-in-image:12.2.1.3");
+        domainMap.put("imagePullSecretName", "ocir-domain");
+      }
+      domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();
 
       testBasicUseCases(domain);

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

@@ -636,8 +636,6 @@ public void deletePVCAndCheckPVReleased() throws Exception {
    * @throws Exception
    */
   public void createDomainOnExistingDirectory() throws Exception {
-    String domainStoragePath = domainMap.get("weblogicDomainStoragePath").toString();
-    String domainDir = domainStoragePath + "/domains/" + domainMap.get("domainUID").toString();
     String cmd =
         BaseTest.getProjectRoot()
             + "/src/integration-tests/bash/krun.sh -m "
@@ -651,11 +649,7 @@ public void createDomainOnExistingDirectory() throws Exception {
             + "\"";
     logger.info("making sure the domain directory exists by running " + cmd);
     ExecResult result = TestUtils.exec(cmd);
-    logger.info("Command result " + result.stdout() + " err =" + result.stderr());
-    /* if (domainDir != null && !(new File(domainDir).exists())) {
-      throw new RuntimeException(
-          "FAIL: the domain directory " + domainDir + " does not exist, exiting!");
-    } */
+    // logger.info("Command result " + result.stdout() + " err =" + result.stderr());
     logger.info("Run the script to create domain");
 
     // create domain using different output dir but pv is same, it fails as the domain was already
@@ -1100,8 +1094,42 @@ protected void callCreateDomainScript(String outputDir) throws Exception {
     String outputStr = result.stdout().trim();
     logger.info("Command returned " + outputStr);
 
+    if (domainMap.containsKey("domainHomeImageBase") && BaseTest.SHARED_CLUSTER) {
+      String dockerLoginAndPushCmd =
+          "docker login "
+              + System.getenv("REPO_REGISTRY")
+              + " -u "
+              + System.getenv("REPO_USERNAME")
+              + " -p \""
+              + System.getenv("REPO_PASSWORD")
+              + "\" && docker push "
+              + System.getenv("REPO_REGISTRY")
+              + "/weblogick8s/domain-home-in-image:"
+              + (System.getenv("IMAGE_TAG_WEBLOGIC") != null
+                  ? System.getenv("IMAGE_TAG_WEBLOGIC")
+                  : "12.2.1.3");
+      result = TestUtils.exec(dockerLoginAndPushCmd);
+      logger.info(
+          "cmd "
+              + dockerLoginAndPushCmd
+              + "\n result "
+              + result.stdout()
+              + "\n err "
+              + result.stderr());
+
+      // create ocir registry secret in the same ns as domain which is used while pulling the domain
+      // image
+      TestUtils.createDockerRegistrySecret(
+          "ocir-domain",
+          System.getenv("REPO_REGISTRY"),
+          System.getenv("REPO_USERNAME"),
+          System.getenv("REPO_PASSWORD"),
+          System.getenv("REPO_EMAIL"),
+          domainNS);
+    }
+
     // write configOverride and configOverrideSecrets to domain.yaml
-    if (domainMap.containsKey("configOverrides")) {
+    if (domainMap.containsKey("configOverrides") || domainMap.containsKey("domainHomeImageBase")) {
       appendToDomainYamlAndCreate();
     }
   }
@@ -1368,6 +1396,11 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
     if (!domainMap.containsKey("domainHomeImageBase")) {
       domainMap.put("domainHome", "/shared/domains/" + domainUid);
       domainMap.put("image", imageName + ":" + imageTag);
+      if (System.getenv("IMAGE_PULL_SECRET_WEBLOGIC") != null) {
+        domainMap.put("imagePullSecretName", System.getenv("IMAGE_PULL_SECRET_WEBLOGIC"));
+      } else {
+        domainMap.put("imagePullSecretName", "docker-store");
+      }
     }
 
     if (domainMap.containsKey("domainHomeImageBuildPath")) {
@@ -1381,11 +1414,7 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
               + "/"
               + ((String) domainMap.get("domainHomeImageBuildPath")).trim());
     }
-    if (System.getenv("IMAGE_PULL_SECRET_WEBLOGIC") != null) {
-      domainMap.put("imagePullSecretName", System.getenv("IMAGE_PULL_SECRET_WEBLOGIC"));
-    } else {
-      domainMap.put("imagePullSecretName", "docker-store");
-    }
+
     // remove null values if any attributes
     domainMap.values().removeIf(Objects::isNull);
 
@@ -1474,20 +1503,24 @@ private void gitCloneDockerImagesSample() throws Exception {
    *     command
    */
   private void appendToDomainYamlAndCreate() throws Exception {
-    String contentToAppend =
-        "  configOverrides: "
-            + domainUid
-            + "-"
-            + domainMap.get("configOverrides")
-            + "\n"
-            + "  configOverrideSecrets: [ \""
-            + domainUid
-            + "-test-secrets\" ]"
-            + "\n";
 
     String domainYaml =
         BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
-    Files.write(Paths.get(domainYaml), contentToAppend.getBytes(), StandardOpenOption.APPEND);
+
+    if (domainMap.containsKey("configOverrides")) {
+      String contentToAppend =
+          "  configOverrides: "
+              + domainUid
+              + "-"
+              + domainMap.get("configOverrides")
+              + "\n"
+              + "  configOverrideSecrets: [ \""
+              + domainUid
+              + "-test-secrets\" ]"
+              + "\n";
+
+      Files.write(Paths.get(domainYaml), contentToAppend.getBytes(), StandardOpenOption.APPEND);
+    }
 
     String command = "kubectl create -f " + domainYaml;
     ExecResult result = TestUtils.exec(command);
@@ -1578,7 +1611,8 @@ private String prepareCmdToCallCreateDomainScript(String outputDir) {
     createDomainScriptCmd.append(generatedInputYamlFile);
 
     // skip executing yaml if configOverrides
-    if (!domainMap.containsKey("configOverrides")) {
+    if (!domainMap.containsKey("configOverrides")
+        && !domainMap.containsKey("domainHomeImageBase")) {
       createDomainScriptCmd.append(" -e ");
     }