Commit 3f4d700

committed

Merge branch 'ipv6-fix-012524' into 'main'

add -g option and create test images repo secret See merge request weblogic-cloud/weblogic-kubernetes-operator!4547

2 parents f83f502 + 5d8f9cd commit 3f4d700Copy full SHA for 3f4d700

File tree

-1

lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes
- ItMiiDomain.java
- ItWseeSSO.java

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ void testCreateMiiDomain() {`
`325`	`325`	`resourcePath,`
`326`	`326`	`adminServerPodName);`
`327`	`327`	`} else {`
`328`		`- String curlCmd2 = "curl -s --show-error --noproxy '*' "`
	`328`	`+ String curlCmd2 = "curl -skg --show-error --noproxy '*' "`
`329`	`329`	`+ " http://" + hostAndPort`
`330`	`330`	`+ "/console/login/LoginForm.jsp --write-out %{http_code} -o /dev/null";`
`331`	`331`	`logger.info("Executing default nodeport curl command {0}", curlCmd2);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;`
`72`	`72`	`import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;`
`73`	`73`	`import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;`
	`74`	`+import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;`
`74`	`75`	`import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyNginx;`
`75`	`76`	`import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;`
`76`	`77`	`import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;`
`@@ -248,6 +249,7 @@ private void createDomain(String domainNamespace, String domainUid, String model`
`248`	`249`	`// create pull secrets for WebLogic image when running in non Kind Kubernetes cluster`
`249`	`250`	`// this secret is used only for non-kind cluster`
`250`	`251`	`createBaseRepoSecret(domainNamespace);`
	`252`	`+ createTestRepoSecret(domainNamespace);`
`251`	`253`
`252`	`254`	`// create secret for admin credential with special characters`
`253`	`255`	// the resultant password is ##W%*}!"'"`']\\\\//1$$~x

Comments

(0)