Skip to content

Commit f439136

Browse files
rjeberhardrjeberhard
committed
Merge branch 'okeconv1' into 'main'
Increased timeout for introspector See merge request weblogic-cloud/weblogic-kubernetes-operator!4755
2 parents 8a40a90 + c333855 commit f439136

35 files changed

+90
-58
lines changed

‎Jenkinsfile.oke

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,16 +424,14 @@ EOF
424424
chmod 777 ${WORKSPACE}/terraform/*.sh
425425
mkdir -p ${WORKSPACE}/terraform/terraforminstall
426426
sh ${WORKSPACE}/terraform/oke.create.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform
427-
428-
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
429-
427+
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
430428
echo "clusterIp : $clusterIP"
431429
clusterPublicIP=${clusterIP:1:-6}
432430
echo " clusterPublicIP : ${clusterPublicIP}"
433-
export NO_PROXY=$NO_PROXY,${clusterPublicIP}
431+
echo "NO_PROXY before : ${NO_PROXY}"
432+
export NO_PROXY=${clusterPublicIP}
434433
echo "NO_PROXY:" $NO_PROXY
435434

436-
437435
export SERVICE_ACCOUNT_NAME=${CLUSTER_NAME}-sa
438436
${KUBERNETES_CLI:-kubectl} -n kube-system create serviceaccount ${SERVICE_ACCOUNT_NAME}
439437
${KUBERNETES_CLI:-kubectl} create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:${SERVICE_ACCOUNT_NAME}
@@ -469,7 +467,7 @@ EOF
469467
mount_target_id=${MOUNT_TARGET_OCID}
470468

471469

472-
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
470+
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
473471

474472
echo "clusterIp : $clusterIP"
475473
clusterPublicIP=${clusterIP:1:-6}
@@ -533,7 +531,7 @@ EOF
533531
touch ${WORKSPACE}/.mvn/maven.config
534532
export KUBECONFIG=${kubeconfig_file}
535533

536-
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
534+
clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[] | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
537535
echo "clusterIp : $clusterIP"
538536
clusterPublicIP=${clusterIP:1:-6}
539537
echo " clusterPublicIP : ${clusterPublicIP}"

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ private static void createDomainResource(String domainUid, String domNamespace,
627627
.configuration(new Configuration()
628628
.model(new Model()
629629
.domainType("WLS"))
630-
.introspectorJobActiveDeadlineSeconds(300L)));
630+
.introspectorJobActiveDeadlineSeconds(3000L)));
631631
setPodAntiAffinity(domain);
632632
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
633633
domainUid, domNamespace);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDBOperator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ public static void initAll(@Namespaces(5) List<String> namespaces) {
203203
traefikHelmParams = traefikParams.getHelmParams();
204204
}
205205

206-
207206
// Create the repo secret to pull the image
208207
// this secret is used only for non-kind cluster
209208
createBaseRepoSecret(fmwDomainNamespace);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsFailedCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ private DomainResource createDomainResourceWithConfigMap(String domainUid,
897897
.domainType("WLS")
898898
.configMap(configmapName)
899899
.runtimeEncryptionSecret(encryptionSecretName))
900-
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 300L)));
900+
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 3000L)));
901901
setPodAntiAffinity(domain);
902902

903903

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ private static void createDomainCrAndVerify(String adminSecretName,
442442
.model(new Model()
443443
.domainType("WLS")
444444
.runtimeEncryptionSecret(encryptionSecretName))
445-
.introspectorJobActiveDeadlineSeconds(300L)));
445+
.introspectorJobActiveDeadlineSeconds(3000L)));
446446

447447
// create cluster resource
448448
if (!Cluster.doesClusterExist(clusterName, CLUSTER_VERSION, domainNamespace)) {

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainOnPV.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
*/
9393
@DisplayName("Test to create a FMW domain in persistent volume with new simplified feature")
9494
@IntegrationTest
95-
@Tag("kind-parallel")
95+
@Tag("kind-sequential")
9696
@Tag("oke-gate")
9797
@Tag("okd-fmw-cert")
9898
@Tag("olcne-sequential")
@@ -145,7 +145,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
145145
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
146146
createBaseRepoSecret(dbNamespace);
147147
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
148-
149148
// install operator and verify its running in ready state
150149
HelmParams opHelmParams =
151150
new HelmParams().releaseName(OPERATOR_RELEASE_NAME)

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ void testFmwDynamicDomainInPV() {
184184
}
185185
// Expose the admin service external node port as a route for OKD
186186
adminSvcExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName), domainNamespace);
187+
if (OKE_CLUSTER_PRIVATEIP) {
188+
Map<String, Integer> clusterNameMsPortMap = new HashMap<>();
189+
clusterNameMsPortMap.put(clusterName, managedServerPort);
190+
ingressHostList
191+
= createIngressForDomainAndVerify(domainUid, domainNamespace, 0, clusterNameMsPortMap,
192+
false, nginxHelmParams.getIngressClassName(), true, 7001);
193+
}
194+
187195
if (TestConstants.KIND_CLUSTER
188196
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
189197
hostHeader = createIngressHostRouting(domainNamespace, domainUid, adminServerName, adminPort);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
354354
.channelName("default")
355355
.nodePort(0))))
356356
.configuration(new Configuration()
357+
.introspectorJobActiveDeadlineSeconds(3000L)
357358
.model(new Model()
358359
.domainType(WLS_DOMAIN_TYPE)
359360
.runtimeEncryptionSecret(encryptionSecretName))));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ private DomainResource createDomainResourceWithConfigMap(String domainUid, Strin
15251525
.domainType("WLS")
15261526
.configMap(configmapName)
15271527
.runtimeEncryptionSecret(encryptionSecretName))
1528-
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 300L)));
1528+
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 3000L)));
15291529
setPodAntiAffinity(domain);
15301530

15311531

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ private static void createDomainCrAndVerify(String adminSecretName, String domIm
343343
.configuration(new Configuration()
344344
.model(new Model()
345345
.domainType("WLS"))
346-
.introspectorJobActiveDeadlineSeconds(300L)));
346+
.introspectorJobActiveDeadlineSeconds(3000L)));
347347
setPodAntiAffinity(domain);
348348
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
349349
domainUid, domainNamespace);

0 commit comments

Comments
 (0)