Skip to content

Commit 0091699

Browse files
committed
Merge branch 'remove-jp' into 'main'
Comment out Japanease Locale test See merge request weblogic-cloud/weblogic-kubernetes-operator!4608
2 parents e691851 + 5e0a47b commit 0091699

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,18 @@ void testIstioDomainHomeInPv() {
226226

227227
// Use the WebLogic(12.2.1.4) Base Image with Japanese Locale
228228
// Add the LANG environment variable to ja_JP.utf8
229-
String imageLocation = null;
229+
// Currently LOCALE testing is disabled till we have 1412 image with
230+
// Japanease Locale
231+
String imageLocation;
230232
if (KIND_REPO != null) {
231233
imageLocation = KIND_REPO + "test-images/weblogic:" + LOCALE_IMAGE_TAG;
232234
} else {
233235
imageLocation = LOCALE_IMAGE_NAME + ":" + LOCALE_IMAGE_TAG;
234236
}
237+
// remove the below line when 141200 lacale image is available
238+
// and modify serverPod env value("en_US.UTF-8")) to ja_JP.utf8
239+
// uncomment assertTrue(matchPodLog(),"LANG is not set to ja_JP.utf8");
240+
imageLocation = WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
235241

236242
// Enable istio in domain custom resource configuration object.
237243
// Add T3Channel Service with port assigned to Istio TCP ingress port.
@@ -262,7 +268,7 @@ void testIstioDomainHomeInPv() {
262268
.serverPod(new ServerPod() //serverpod
263269
.addEnvItem(new V1EnvVar()
264270
.name("LANG")
265-
.value("ja_JP.utf8"))
271+
.value("en_US.UTF-8")) // ja_JP.utf8
266272
.addEnvItem(new V1EnvVar()
267273
.name("JAVA_OPTIONS")
268274
.value("-Dweblogic.StdoutDebugEnabled=false "
@@ -298,7 +304,7 @@ void testIstioDomainHomeInPv() {
298304
checkPodReadyAndServiceExists(managedServerPodNamePrefix + i, domainUid, domainNamespace);
299305
}
300306
// Make sure Japanese character is found in server pod log
301-
assertTrue(matchPodLog(),"LANG is not set to ja_JP.utf8");
307+
// assertTrue(matchPodLog(),"LANG is not set to ja_JP.utf8");
302308

303309
String clusterService = domainUid + "-cluster-" + clusterName + "." + domainNamespace + ".svc.cluster.local";
304310

0 commit comments

Comments
 (0)