Merge branch 'xc-118838' into 'release/4.2'

rjeberhard · rjeberhard · commit 8bb2bcee2188 · 2024-06-13T20:36:36.000Z
disable installOracleDBOperator in crio pipeline

See merge request weblogic-cloud/weblogic-kubernetes-operator!4728
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java
@@ -311,7 +311,7 @@ public void beforeAll(ExtensionContext context) {
           installTraefikLB();
         }
         //install Oracle Database operator as a one time task
-        if (!OCNE && !OKD) {
+        if (!OCNE && !OKD && !CRIO) {
           installOracleDBOperator();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public void beforeAll(ExtensionContext context) {`
`311`	`311`	`installTraefikLB();`
`312`	`312`	`}`
`313`	`313`	`//install Oracle Database operator as a one time task`
`314`		`- if (!OCNE && !OKD) {`
	`314`	`+ if (!OCNE && !OKD && !CRIO) {`
`315`	`315`	`installOracleDBOperator();`
`316`	`316`	`}`
`317`	`317`