From 146bb31afa3eb3247d7e816629544b301b3d5d70 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Mon, 23 Jan 2023 21:37:50 +0000 Subject: [PATCH] backport pr3862 to release/3.4 --- .../weblogic/kubernetes/ItMiiDynamicUpdatePart2.java | 7 +++---- .../weblogic/kubernetes/ItMiiDynamicUpdatePart3.java | 7 +++---- .../weblogic/kubernetes/ItMiiUpdateDomainConfig.java | 4 ++-- .../wdt-models/model.delete.sysresourcesbyconfigmap.yaml | 4 ++++ 4 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 integration-tests/src/test/resources/wdt-models/model.delete.sysresourcesbyconfigmap.yaml diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java index d8443693e71..b5907ce18d1 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2022, Oracle and/or its affiliates. +// Copyright (c) 2021, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -199,9 +199,8 @@ void testMiiDeleteDatasource() { // write sparse yaml to delete datasource to file Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml"); String yamlToDeleteDS = "resources:\n" - + " JDBCSystemResource:\n" - + " '!TestDataSource2':"; - + + " JDBCSystemResource:\n"; + assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes())); // Replace contents of an existing configMap with cm config diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java index 2b75460eedd..5af549831d2 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2022, Oracle and/or its affiliates. +// Copyright (c) 2021, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -323,9 +323,8 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() { // write sparse yaml to delete datasource to file, delete ds to keep the config clean Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml"); String yamlToDeleteDS = "resources:\n" - + " JDBCSystemResource:\n" - + " '!TestDataSource2':"; - + + " JDBCSystemResource:\n"; + assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes())); pods = new LinkedHashMap<>(); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java index 0380e2ed5da..4e60b7e6208 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2022, Oracle and/or its affiliates. +// Copyright (c) 2020, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -399,7 +399,7 @@ void testMiiDeleteSystemResources() { String configMapName = "deletesysrescm"; createConfigMapAndVerify( configMapName, domainUid, domainNamespace, - Arrays.asList(MODEL_DIR + "/model.delete.sysresources.yaml")); + Arrays.asList(MODEL_DIR + "/model.delete.sysresourcesbyconfigmap.yaml")); LinkedHashMap pods = new LinkedHashMap<>(); // get the creation time of the admin server pod before patching diff --git a/integration-tests/src/test/resources/wdt-models/model.delete.sysresourcesbyconfigmap.yaml b/integration-tests/src/test/resources/wdt-models/model.delete.sysresourcesbyconfigmap.yaml new file mode 100644 index 00000000000..10a6c443f85 --- /dev/null +++ b/integration-tests/src/test/resources/wdt-models/model.delete.sysresourcesbyconfigmap.yaml @@ -0,0 +1,4 @@ +# Copyright (c) 2023, Oracle and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. + +##empty file to remove all the system resources