Fix for running external Jenkins Job for OKE with current image path changes

Author: marinakog

Jenkinsfile.oke

@@ -61,16 +61,16 @@ pipeline {
 
         string(name: 'KUBE_VERSION',
                description: 'kube version for oke cluster',
-               defaultValue: '1.25.4'
+               defaultValue: '1.26.2'
         )
         string(name: 'IMAGE_ID',
                        description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',
                        //defaultValue7.6: 'ocid1.image.oc1.phx.aaaaaaaancucg25pze6m52agxwxmmfszvsdnhp3kvim53pts2tw6mik4xtha'
-                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaancq36l7q4fqwznqhnp626wuekkq7twk2em5ysyd65bd4xho72tmq'
+                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaanubtknjwx3bra4zvi3kuwgkpiku2brdjjzj5eiv7pimmzfjka4dq'
                 )
         string(name: 'KUBECTL_VERSION',
                        description: 'kubectl version',
-                       defaultValue: '1.25.4'
+                       defaultValue: '1.26.2'
                 )
         string(name: 'HELM_VERSION',
                description: 'Helm version',
@@ -113,25 +113,33 @@ pipeline {
                description: '',
                defaultValue: 'phx.ocir.io'
         )
+        string(name: 'NODE_SHAPE',
+                       description: '',
+                       defaultValue: 'VM.Standard.E3.Flex'
+                )
+        string(name: 'BRANCH',
+                       description: '',
+                       defaultValue: 'okeextfix'
+                )
         string(name: 'WEBLOGIC_IMAGE_NAME',
                description: 'WebLogic base image name. Default is the image name in OCIR. Use middleware/weblogic for OCR.',
-               defaultValue: 'weblogick8s/test-images/weblogic'
+               defaultValue: 'test-images/weblogic'
         )
         string(name: 'WEBLOGIC_IMAGE_TAG',
                description: '12.2.1.3  (12.2.1.3-ol7) , 12.2.1.3-dev  (12.2.1.3-dev-ol7), 12.2.1.3-ol8, 12.2.1.3-dev-ol8, 12.2.1.4,  12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
                defaultValue: '12.2.1.4'
         )
         string(name: 'FMWINFRA_IMAGE_NAME',
                description: 'FWM Infra image name. Default is the image name in OCIR. Use middleware/fmw-infrastructure for OCR.',
-               defaultValue: 'weblogick8s/test-images/fmw-infrastructure'
+               defaultValue: 'test-images/fmw-infrastructure'
         )
         string(name: 'FMWINFRA_IMAGE_TAG',
                description: 'FWM Infra image tag',
                defaultValue: '12.2.1.4'
         )
         string(name: 'DB_IMAGE_NAME',
                description: 'Oracle DB image name. Default is the image name in OCIR, use database/enterprise for OCR.',
-               defaultValue: 'weblogick8s/test-images/database/enterprise'
+               defaultValue: 'test-images/database/enterprise'
         )
         string(name: 'DB_IMAGE_TAG',
                description: 'Oracle DB image tag',
@@ -205,7 +213,7 @@ pipeline {
                 stage('Setup terraform property file  ') {
                     environment {
                         OKE_CLUSTER_NAME="${CLUSTER_NAME}"
-                        NODE_SHAPE="VM.Standard2.24"
+                        NODE_SHAPE="${NODE_SHAPE}"
                         IMAGE_ID="${IMAGE_ID}"
                         OCI_PROP_FILE="${WORKSPACE}/terraform/oci.prop"
                         TVARS_FILE = credentials("${terraform_property_file}")

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java

@@ -55,13 +55,13 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_PATCH;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
+import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_STATUS_CONDITION_ROLLING_TYPE;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
-import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
@@ -727,7 +727,7 @@ void testUpdateImageName() {
     logger.info("WEBLOGIC_IMAGE_NAME {0}", WEBLOGIC_IMAGE_NAME);
 
     String kindWlsImage = KIND_REPO + WEBLOGIC_IMAGE_NAME_DEFAULT;
-    String testWlsImage = TEST_IMAGES_REPO + "/" + WEBLOGIC_IMAGE_NAME_DEFAULT; 
+    String testWlsImage = DOMAIN_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT;
     //change image name to imageUpdate
     String imageTag = CommonTestUtils.getDateAndTimeStamp();
     String imageUpdate = KIND_REPO != null 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDBOperator.java

@@ -204,7 +204,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
     // this secret is used only for non-kind cluster
     createBaseRepoSecret(fmwDomainNamespace);
     createBaseRepoSecret(wlsDomainNamespace);
-
+    createTestRepoSecret(wlsDomainNamespace);
     // create PV, PVC for logs/data
     createPV(pvName, wlsDomainUid, ItIstioDBOperator.class.getSimpleName());
     createPVC(pvName, pvcName, wlsDomainUid, wlsDomainNamespace);
@@ -406,7 +406,6 @@ void  testIstioWlsModelInImageWithDbOperator() {
 
     // Create the repo secret to pull the image
     // this secret is used only for non-kind cluster
-    createTestRepoSecret(wlsDomainNamespace);
 
     // create secret for admin credentials
     logger.info("Create secret for admin credentials");

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java

@@ -31,6 +31,7 @@
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
+import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_STATUS_CONDITION_FAILED_TYPE;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
@@ -401,7 +402,7 @@ void testUpdateBaseImageName() {
     String imageTag = getDateAndTimeStamp();
     String imageUpdate = KIND_REPO != null ? KIND_REPO
         + (WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1)
-        : TEST_IMAGES_REPO + "/" + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag;
+        : DOMAIN_IMAGES_PREFIX + TEST_IMAGES_REPO + "/" + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag;
     imageTag(imageName, imageUpdate);
     imageRepoLoginAndPushImageToRegistry(imageUpdate);
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsSamples.java

@@ -39,7 +39,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
-import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
+import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.FSS_DIR;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
@@ -217,7 +217,7 @@ void testSampleDomainInImage(String model) {
     String domainName = model.split(":")[1];
     String script = model.split(":")[0];
 
-    String imageName = DOMAIN_IMAGES_REPO + diiImageNameBase + "-" + script + ":" + diiImageTag;
+    String imageName = DOMAIN_IMAGES_PREFIX + diiImageNameBase + "-" + script + ":" + diiImageTag;
     Path testSamplePath = get(WORK_DIR, "wls-sample-testing", "domainInImage", domainName, script);
     //copy the samples directory to a temporary location
     setupSample(testSamplePath);

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java

@@ -852,8 +852,12 @@ public static String createOracleDBUsingOperator(String dbName, String sysPasswo
     replaceStringInFile(dbYaml.toString(), "secretKey:", "secretKey: " + secretKey);
     replaceStringInFile(dbYaml.toString(), "pullFrom:", "pullFrom: " + DB_IMAGE_19C);
     replaceStringInFile(dbYaml.toString(), "pullSecrets:", "pullSecrets: " + BASE_IMAGES_REPO_SECRET_NAME);
+    String storageClass = "weblogic-domain-storage-class";
+    if (OKE_CLUSTER) {
+      storageClass = "oci-fss";
+    }
     replaceStringInFile(dbYaml.toString(), "storageClass: \"oci-bv\"",
-        "storageClass: \"weblogic-domain-storage-class\"");
+        "storageClass: \"" + storageClass + "\"");
     replaceStringInFile(dbYaml.toString(), "accessMode: \"ReadWriteOnce\"", "accessMode: \"ReadWriteMany\"");
     replaceStringInFile(dbYaml.toString(), "volumeName: \"\"", "volumeName: \"" + pvName + "\"");
 
@@ -935,8 +939,12 @@ public static String createOraclePrebuiltDBUsingOperator(String dbName, String s
     replaceStringInFile(dbYaml.toString(), "pullFrom: container-registry.oracle.com/database/express:latest", 
         "pullFrom: " + DB_PREBUILT_IMAGE);
     replaceStringInFile(dbYaml.toString(), "pullSecrets:", "pullSecrets: " + BASE_IMAGES_REPO_SECRET_NAME);
+    String storageClass = "weblogic-domain-storage-class";
+    if (OKE_CLUSTER) {
+      storageClass = "oci-fss";
+    }
     replaceStringInFile(dbYaml.toString(), "storageClass: \"oci-bv\"",
-        "storageClass: \"weblogic-domain-storage-class\"");
+        "storageClass: \"" + storageClass + "\"");
     replaceStringInFile(dbYaml.toString(), "accessMode: \"ReadWriteOnce\"", "accessMode: \"ReadWriteMany\"");
     replaceStringInFile(dbYaml.toString(), "volumeName: \"\"", "volumeName: \"" + pvName + "\"");
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ImageUtils.java

@@ -589,7 +589,7 @@ public static String createImageAndPushToRepo(String dockerFileDir, String baseI
     // create unique image name with date
     final String imageTag = getDateAndTimeStamp();
     // Add repository name in image name for Jenkins runs
-    final String imageName = DOMAIN_IMAGES_REPO + baseImageName;
+    final String imageName = DOMAIN_IMAGES_PREFIX + baseImageName;
 
     final String image = imageName + ":" + imageTag;
     LoggingFacade logger = getLogger();

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ItMiiSampleHelper.java

@@ -20,7 +20,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
-import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
+import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
@@ -80,7 +80,7 @@ public enum ImageType {
   }
 
   private String getModelImageName(String suffix) {
-    return new StringBuffer(DOMAIN_IMAGES_REPO)
+    return new StringBuffer(DOMAIN_IMAGES_PREFIX)
         .append("mii-")
         .append(suffix).toString();
   }

integration-tests/src/test/resources/oke/terraform/node-pool.tf

@@ -29,7 +29,11 @@ resource "oci_containerengine_node_pool" "tfsample_node_pool" {
        source_type = "image"
        boot_volume_size_in_gbs = "200"
   }
-
+  node_shape_config {
+      #Optional
+      memory_in_gbs = 192.0
+      ocpus = 3.0
+  }
   # Optional
   initial_node_labels {
       key = "name"

kubernetes/samples/scripts/terraform/cluster.tf

@@ -100,6 +100,12 @@ resource "oci_containerengine_node_pool" "tfsample_node_pool" {
     create = "60m"
     delete = "2h"
   }
+  node_shape_config {
+    #Optional
+   	memory_in_gbs = 200.0
+    ocpus = 3.0
+  }
+
 
   #Optional
   quantity_per_subnet = var.node_pool_quantity_per_subnet