Merge branch 'okearm' into 'release/4.2'

OWLS-122761, updated Jenkinsfile.armoke file to reflect all changes in terraform and version for OKE cluster

See merge request weblogic-cloud/weblogic-kubernetes-operator!4839

Author: rjeberhard

Jenkinsfile.armoke

@@ -83,7 +83,7 @@ pipeline {
 
         string(name: 'OKE_KUBE_VERSION',
                description: 'kube version for oke cluster',
-               defaultValue: '1.30.0'
+               defaultValue: '1.30.1'
         )
         string(name: 'IMAGE_ID',
                        description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',

Jenkinsfile.oke

@@ -88,7 +88,6 @@
 @DisplayName("Verify cross domain transaction with istio enabled is successful")
 @IntegrationTest
 @Tag("kind-parallel")
-@Tag("oke-arm")
 @Tag("oke-parallel")
 class ItIstioCrossDomainTransaction {
 

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

@@ -9,6 +9,7 @@
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecResult;
 
+import static oracle.weblogic.kubernetes.TestConstants.ARM;
 import static oracle.weblogic.kubernetes.TestConstants.BUSYBOX_IMAGE;
 import static oracle.weblogic.kubernetes.TestConstants.BUSYBOX_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
@@ -185,6 +186,10 @@ private String buildWitCommand() {
         + " --wdtJavaOptions " + YAML_MAX_FILE_SIZE_PROPERTY
         + ownership;
 
+    if (ARM) {
+      command += " --platform linux/arm64";
+    }
+
     if (params.wdtModelOnly()) {
       command += " --wdtModelOnly ";
     }

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/WebLogicImageTool.java

@@ -319,7 +319,7 @@ public void beforeAll(ExtensionContext context) {
           installTraefikLB();
         }
         //install Oracle Database operator as a one time task
-        if (!OCNE && !OKD && !CRIO) {
+        if (!OCNE && !OKD && !CRIO && !ARM) {
           installOracleDBOperator();
         }
 

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

@@ -30,8 +30,9 @@ generateTFVarFile() {
     sed -i -e "s:@NODEPOOLIMAGENAME@:${nodepool_imagename}:g" ${tfVarsFiletfVarsFile}
     sed -i -e "s:@NODEPOOLSSHPUBKEY@:${nodepool_ssh_pubkeypath}:g" ${tfVarsFiletfVarsFile}
     sed -i -e "s:@NODEPOOLSSHPK@:${nodepool_ssh_pkpath}:g" ${tfVarsFiletfVarsFile}
-    sed -i -e "s:@REGION@:${region}:g" ${tfVarsFiletfVarsFile}
     sed -i -e "s:@MOUNTTARGETOCID@:${mount_target_ocid}:g" ${tfVarsFiletfVarsFile}
+    sed -i -e "s:@REGION@:${region}:g" ${tfVarsFiletfVarsFile}
+    sed -i -e "s:@REGIONSHORT@:${region_short}:g" ${tfVarsFiletfVarsFile}
     echo "Generated TFVars file [${tfVarsFiletfVarsFile}]"
 }
 
@@ -193,6 +194,7 @@ nodepool_ssh_pkpath=$(prop 'nodepool.ssh.pkpath')
 region=$(prop 'region')
 terraformDir=$(prop 'terraform.installdir')
 mount_target_ocid=$(prop 'mounttarget.ocid')
+region_short=$(echo "$region" | sed 's/.*-\([a-z]*\)-.*/\1/')
 
 # generate terraform configuration file with name $(clusterTFVarsFile).tfvar
 #generateTFVarFile

integration-tests/src/test/resources/oke/terraform/okemodule/oke.create.sh

@@ -35,7 +35,7 @@ mount_target_ocid="@MOUNTTARGETOCID@"
 # ## For regions, # Use short form e.g. ashburn from location column https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm
 # ## VCN, Pods and services clusters must not overlap with each other and with those of other clusters.
  clusters = {
-   c1 = { region = "phoenix", vcn = "10.1.0.0/16", pods = "10.201.0.0/16", services = "10.101.0.0/16", enabled = true }
+   c1 = { region = "@REGIONSHORT@", vcn = "10.1.0.0/16", pods = "10.201.0.0/16", services = "10.101.0.0/16", enabled = true }
      }
 #
      kubernetes_version = "@OKEK8SVERSION@"