Skip to content

Commit 9db5bb6

Browse files
authored
skip deleting istio-system namespace in OCNE environment (#4077)
* skip deleting istio-system namespace in OCNE environment
1 parent bb47365 commit 9db5bb6

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

integration-tests/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<wko.it.node.ip>${env.NODE_IP}</wko.it.node.ip>
5151
<wko.it.fss.dir>${env.FSS_DIR}</wko.it.fss.dir>
5252
<wko.it.okd.cluster>${env.OKD}</wko.it.okd.cluster>
53+
<wko.it.ocne.cluster>${env.OCNE}</wko.it.ocne.cluster>
5354
<wko.it.oracle.db.operator.release>${env.ORACLE_DB_OPERATOR_RELEASE}</wko.it.oracle.db.operator.release>
5455
<wko.it.oraclelinux.test.version>${env.ORACLELINUX_TEST_VERSION}</wko.it.oraclelinux.test.version>
5556
<wko.it.wdt.download.url>${wdt.download.url}</wko.it.wdt.download.url>
@@ -228,6 +229,7 @@
228229
<wko.it.nfs.server>${wko.it.nfs.server}</wko.it.nfs.server>
229230
<wko.it.fss.dir>${wko.it.fss.dir}</wko.it.fss.dir>
230231
<wko.it.okd.cluster>${wko.it.okd.cluster}</wko.it.okd.cluster>
232+
<wko.it.ocne.cluster>${wko.it.ocne.cluster}</wko.it.ocne.cluster>
231233
<wko.it.oracle.db.operator.release>${wko.it.oracle.db.operator.release}</wko.it.oracle.db.operator.release>
232234
<wko.it.oraclelinux.test.version>${wko.it.oraclelinux.test.version}</wko.it.oraclelinux.test.version>
233235
<wko.it.wdt.download.url>${wko.it.wdt.download.url}</wko.it.wdt.download.url>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,10 @@ public interface TestConstants {
348348
public static final boolean OKD =
349349
Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.okd.cluster", "false"));
350350

351+
// OCNE constants
352+
public static final boolean OCNE =
353+
Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.ocne.cluster", "false"));
354+
351355
// default name suffixes
352356
public String DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX = "-ext";
353357
public String DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX = "-introspector";

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
5858
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
5959
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_WDT_MODEL_FILE;
60+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
6061
import static oracle.weblogic.kubernetes.TestConstants.OKD;
6162
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6263
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
@@ -292,7 +293,7 @@ public void beforeAll(ExtensionContext context) {
292293

293294
// set initialization success to true, not counting the istio installation as not all tests use istio
294295
isInitializationSuccessful = true;
295-
if (!OKD) {
296+
if ((!OKD && !OCNE) || (OCNE && !assertDoesNotThrow(() -> Namespace.exists("istio-system")))) {
296297
logger.info("Installing istio before any test suites are run");
297298
installIstio();
298299
}
@@ -336,11 +337,11 @@ public void close() {
336337
if (SKIP_CLEANUP) {
337338
logger.info("Skipping RESULTS_ROOT clean up after test execution");
338339
} else {
339-
if (!OKD) {
340+
if (!OKD && !OCNE) {
340341
logger.info("Uninstall istio after all test suites are run");
341342
uninstallIstio();
342343
}
343-
if (!OKD && !OKE_CLUSTER) {
344+
if (!OKD && !OKE_CLUSTER && !OCNE) {
344345
logger.info("Delete istio-system namespace after all test suites are run");
345346
deleteNamespace("istio-system");
346347
}
@@ -618,5 +619,4 @@ private OperatorParams installWebHookOnlyOperator() {
618619
"null" // domainNamespace
619620
);
620621
}
621-
622622
}

0 commit comments

Comments
 (0)