Skip to content

Commit ee09b15

Browse files
xiancaorjeberhard
authored andcommitted
install db operator only in non-ocne environment
1 parent 673fddc commit ee09b15

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
286286
@Test
287287
@DisplayName("Test introSpectVersion starting a introspector and updating domain status")
288288
@Tag("gate")
289-
@Tag("crio")
290289
void testDomainIntrospectVersionNotRolling() {
291290
// get the pod creation time stamps
292291
Map<String, OffsetDateTime> pods = new LinkedHashMap<>();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ public static void initAll(@Namespaces(6) List<String> namespaces) {
237237
@Test
238238
@DisplayName("Test domain events for various successful domain life cycle changes")
239239
@Tag("gate")
240-
@Tag("crio")
241240
void testK8SEventsSuccess() {
242241
OffsetDateTime timestamp = now();
243242
logger.info("Creating domain");

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,9 @@ public void beforeAll(ExtensionContext context) {
311311
installTraefikLB();
312312
}
313313
//install Oracle Database operator as a one time task
314-
installOracleDBOperator();
314+
if (!OCNE && !OKD && !CRIO) {
315+
installOracleDBOperator();
316+
}
315317

316318
// set initialization success to true, not counting the istio installation as not all tests use istio
317319
isInitializationSuccessful = true;
@@ -672,7 +674,9 @@ private void installTraefikLB() {
672674
private void installOracleDBOperator() {
673675
//install Oracle Database Operator
674676
String namespace = ORACLE_OPERATOR_NS;
675-
assertDoesNotThrow(() -> new Namespace().name(namespace).create());
677+
if (!assertDoesNotThrow(() -> Namespace.exists(namespace))) {
678+
assertDoesNotThrow(() -> new Namespace().name(namespace).create());
679+
}
676680
assertDoesNotThrow(() -> installDBOperator(), "Failed to install database operator");
677681
}
678682

0 commit comments

Comments
 (0)