Changes to log messages into individual log file for each It class #1765

vanajamukkara · 2020-06-24T21:14:00Z

log messages into individual log file for each It class, same for sequential or parallel run.
fix port conflict issues with nginx when tests run in parallel, made by Xian.

This PR is mainly for logging messages. There are failures when tests ran in parallel which needs to be looked into. There will be a separate PR to make the tests work when run in parallel.

Jenkins Results -- intermittent failures not related to the changes in the PR
https://build.weblogick8s.org:8443/job/weblogic-kubernetes-operator-kind-new/529/
https://build.weblogick8s.org:8443/job/weblogic-kubernetes-operator-model-in-image-tests-1/48/

…es-operator into junit5-tests-parallel

fix Nginx clusterrole and node port conflicts

xiancao · 2020-06-25T16:58:09Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

@@ -34,7 +34,9 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.annotations.tags.MustNotRunInParallel;
 import oracle.weblogic.kubernetes.annotations.tags.Slow;
-import oracle.weblogic.kubernetes.extensions.LoggedTest;
+//import oracle.weblogic.kubernetes.extensions.LoggedTest;


remove commented out import

xiancao · 2020-06-25T17:05:37Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiConfigMap.java

@@ -107,6 +109,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(2) List<String> namespaces) {
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:05:55Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiConfigMapOverride.java

@@ -118,6 +120,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(2) List<String> namespaces) {
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:06:10Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

@@ -132,6 +135,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(3) List<String> namespaces) {
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:06:24Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiMultiModel.java

@@ -119,7 +122,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(2) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:06:36Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiSample.java

@@ -89,7 +91,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(5) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:06:54Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java

@@ -184,7 +187,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(6) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


xiancao · 2020-06-25T17:07:34Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorTwoDomains.java

@@ -129,7 +131,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(4) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:07:46Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java

@@ -80,7 +82,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(2) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:08:17Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSessionMigration.java

@@ -100,6 +102,7 @@
   */
  @BeforeAll
  public static void init(@Namespaces(2) List<String> namespaces) {
+    logger = ThreadSafeLogger.getLogger();


xiancao · 2020-06-25T17:08:38Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleValidation.java

@@ -61,27 +62,31 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;

+//import oracle.weblogic.kubernetes.extensions.LoggedTest;


remove commented out import

xiancao · 2020-06-25T17:09:00Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleValidation.java

  /**
   * Setup for test suite. Creates service account, persistent volume
   * and persistent volume claim.
   * @param namespaces injected by JUnit extension
   */
  @BeforeAll
  public void setup(@Namespaces(2) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

xiancao · 2020-06-25T17:09:55Z

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleValidation.java

@@ -232,7 +237,7 @@ public void testInstallingOperator() {
  /**
   * Create domain.
   */
-  @Test
+  //@Test


either enable the test or delete this test method

xiancao · 2020-06-25T17:11:17Z

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

@@ -98,7 +100,7 @@
   */
  @BeforeAll
  public static void initAll(@Namespaces(3) List<String> namespaces) {
-
+    logger = ThreadSafeLogger.getLogger();


you can static import ThreadSafeLogger.getLogger then just call getLogger() here like in other It* classes.

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java

xiancao · 2020-06-25T17:29:01Z

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

 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL;

+//import oracle.weblogic.kubernetes.logging.LoggingFacade;
+//import static oracle.weblogic.kubernetes.extensions.LoggedTest.logger;


remove commented out imports

xiancao · 2020-06-25T17:30:39Z

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

+
+  }
+
+


remove empty line here

xiancao

LGTM

vanajamukkara and others added 17 commits June 11, 2020 17:16

adding junit-platform.properties to run IT classes in parallel

5dbc60b

run classes in parallel

6e51ae2

Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…

49d0d26

…es-operator into junit5-tests-parallel

use ThreadLocal to save the local logger

ebce5ea

Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…

0e5b0e3

…es-operator into junit5-tests-parallel

use separate logger for each It class

50a686c

echo mvn command

0acbe3d

using ThreadSafeLogger

ebfd264

fix nginx clusterrole and node port conflicts in parallel

1418d07

use local var for logger

326b4c7

sync with latest develop

6f3dc50

sync with latest develop

4c13cd8

sync to latest develop and modify new classes for logger

b61390b

fix ItDomainInPV

fcda3c3

using inheritablethreadlocal

54cda71

Merge branch 'junit5-tests-parallel' into xc-test-parallel

9e8285a

Merge pull request #1760 from oracle/xc-test-parallel

fdbce56

fix Nginx clusterrole and node port conflicts

vanajamukkara changed the title ~~Changes to log messages into individual log file for each It Class~~ Changes to log messages into individual log file for each It class Jun 24, 2020

vanajamukkara added 5 commits June 24, 2020 16:42

fix checkstyle issue

159199c

commenting debug msgs

aa41773

sync with latest develop

6977645

make parallel run false by default

33cf7a9

fix merge issues

7ddf816

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java Show resolved Hide resolved

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java Show resolved Hide resolved

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java Show resolved Hide resolved

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java Show resolved Hide resolved

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java Show resolved Hide resolved

xiancao reviewed Jun 25, 2020

View reviewed changes

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/LoggingExtension.java Outdated

}

Copy link

Member

xiancao Jun 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove empty line here

xiancao approved these changes Jun 25, 2020

View reviewed changes

rjeberhard approved these changes Jun 25, 2020

View reviewed changes

rjeberhard merged commit b1a4764 into develop Jun 25, 2020

vanajamukkara added 4 commits June 25, 2020 14:00

remove commented code, fix NPE in voyager

5915a73

fix merge issues

bdc3012

sync with latest develop

08c58ee

addressing review comments by Xian

b1d03c1

This was referenced Jun 26, 2020

Adding JRF domain into ItJrfDomainInPV #1767

Merged

Istiocdxaction #1771

Merged

rjeberhard deleted the junit5-tests-parallel branch January 5, 2021 21:58

Changes to log messages into individual log file for each It class #1765

Changes to log messages into individual log file for each It class #1765

Uh oh!

Conversation

vanajamukkara commented Jun 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xiancao left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vanajamukkara commented Jun 24, 2020 •

edited

Loading