From d044b81250ff4a179706448f8daddc1c8c442620 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Mon, 13 Dec 2021 17:14:41 +0000 Subject: [PATCH 1/5] fix nightly --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index b8d10490090..6b4a0f21754 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -479,7 +479,8 @@ void testErrorPathDomainMismatchMountPath() { assertDoesNotThrow(() -> createDomainCustomResource(domainCR), "createDomainCustomResource throws Exception"); // check the introspector pod log contains the expected error message - String expectedErrorMsg = "Auxiliary Image: Dir '/errorpath' doesn't exist or is empty. Exiting."; + //String expectedErrorMsg = "Auxiliary Image: Dir '/errorpath' doesn't exist or is empty. Exiting."; + String expectedErrorMsg = "cp: can't stat '/errorpath/*': No such file or directory"; verifyIntrospectorPodLogContainsExpectedErrorMsg(domainUid, errorpathDomainNamespace, expectedErrorMsg); // check the domain event contains the expected error message From a6ab57397de430ddf91d8e8ba73c13d53dd80fe1 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Mon, 13 Dec 2021 17:19:14 +0000 Subject: [PATCH 2/5] wip --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 1 - 1 file changed, 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index 6b4a0f21754..568163b055e 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -479,7 +479,6 @@ void testErrorPathDomainMismatchMountPath() { assertDoesNotThrow(() -> createDomainCustomResource(domainCR), "createDomainCustomResource throws Exception"); // check the introspector pod log contains the expected error message - //String expectedErrorMsg = "Auxiliary Image: Dir '/errorpath' doesn't exist or is empty. Exiting."; String expectedErrorMsg = "cp: can't stat '/errorpath/*': No such file or directory"; verifyIntrospectorPodLogContainsExpectedErrorMsg(domainUid, errorpathDomainNamespace, expectedErrorMsg); From 3dcef6d9780c1188b6e4e19e0b79685b1c5dabc6 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 6 Jan 2022 17:05:31 +0000 Subject: [PATCH 3/5] change copyright to 2022 --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index 568163b055e..82a8abebdbf 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2022, 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; From 6499bc2d0b006db1a9897b608ed162e868c2b335 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 6 Jan 2022 17:23:19 +0000 Subject: [PATCH 4/5] minor copyright change --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index 82a8abebdbf..51bd493d31a 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Oracle and/or its affiliates. +// Copyright (c) 2021, 2022 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; From 4d03bfdcad2185a9df4b9a5e63f269d754930617 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 6 Jan 2022 18:07:22 +0000 Subject: [PATCH 5/5] minor change --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index 51bd493d31a..7fe00ae3d68 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2022 Oracle and/or its affiliates. +// Copyright (c) 2021, 2022, 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;