From 5f9002febca04baa1c053966698d27517ce5a79e Mon Sep 17 00:00:00 2001
From: Peter Nied <petern@amazon.com>
Date: Fri, 22 Sep 2023 01:53:44 +0000
Subject: [PATCH] Slim down log output and amp up number of tests for
 troubleshooting

Signed-off-by: Peter Nied <petern@amazon.com>
---
 .github/workflows/ci.yml                      |  4 +++
 build.gradle                                  |  2 ++
 .../resources/log4j2-test.properties          | 28 +++++++++++--------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9fc9b5d1e..127f30c286 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,6 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        number: [1,2,3,4,5,6,7,8,9] # Making sure these tests aren't flaky
         jdk: [11, 17]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
@@ -97,6 +98,9 @@ jobs:
         distribution: temurin # Temurin is a distribution of adoptium
         java-version: ${{ matrix.jdk }}
 
+    - if: ${{ runner.os == 'Windows' }}
+      run: tracert www.google.com
+
     - name: Checkout security
       uses: actions/checkout@v4
 
diff --git a/build.gradle b/build.gradle
index 726596b16f..79f531a06a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -457,6 +457,7 @@ sourceSets {
             srcDir file ('src/integrationTest/java')
             compileClasspath += sourceSets.main.output
             runtimeClasspath += sourceSets.main.output
+
         }
         resources {
             srcDir file('src/integrationTest/resources')
@@ -474,6 +475,7 @@ task integrationTest(type: Test) {
     systemProperty "java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager"
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
+    jvmArgs += "-Djdk.internal.httpclient.disableHostnameVerification"
     retry {
         failOnPassedAfterRetry = false
         maxRetries = 2
diff --git a/src/integrationTest/resources/log4j2-test.properties b/src/integrationTest/resources/log4j2-test.properties
index 8d9cf87666..d393d54cc1 100644
--- a/src/integrationTest/resources/log4j2-test.properties
+++ b/src/integrationTest/resources/log4j2-test.properties
@@ -1,4 +1,4 @@
-status = info
+status = warn
 name = Integration test logging configuration
 packages = org.opensearch.test.framework.log
 
@@ -14,31 +14,37 @@ appender.console.filter.prerelease.onMismatch=NEUTRAL
 appender.capturing.type = LogCapturingAppender
 appender.capturing.name = logCapturingAppender
 
-rootLogger.level = info
+rootLogger.level = warn
 rootLogger.appenderRef.stdout.ref = consoleAppender
 
 logger.testsecconfig.name = org.opensearch.test.framework.TestSecurityConfig
-logger.testsecconfig.level = info
+logger.testsecconfig.level = warn
 logger.localopensearchcluster.name=org.opensearch.test.framework.cluster.LocalOpenSearchCluster
-logger.localopensearchcluster.level = info
+logger.localopensearchcluster.level = warn
 
 logger.auditlogs.name=org.opensearch.test.framework.audit
-logger.auditlogs.level = info
+logger.auditlogs.level = warn
 
 # Logger required by test org.opensearch.security.http.JwtAuthenticationTests
 logger.httpjwtauthenticator.name = com.amazon.dlic.auth.http.jwt.HTTPJwtAuthenticator
-logger.httpjwtauthenticator.level = debug
-logger.httpjwtauthenticator.appenderRef.capturing.ref = logCapturingAppender
+logger.httpjwtauthenticator.level = warn
+#logger.httpjwtauthenticator.appenderRef.capturing.ref = logCapturingAppender
 
 #Required by tests:
 # org.opensearch.security.IpBruteForceAttacksPreventionTests
 # org.opensearch.security.UserBruteForceAttacksPreventionTests
 logger.backendreg.name = org.opensearch.security.auth.BackendRegistry
-logger.backendreg.level = debug
-logger.backendreg.appenderRef.capturing.ref = logCapturingAppender
+logger.backendreg.level = warn
+#logger.backendreg.appenderRef.capturing.ref = logCapturingAppender
 
 #com.amazon.dlic.auth.ldap
 #logger.ldap.name=com.amazon.dlic.auth.ldap.backend.LDAPAuthenticationBackend
 logger.ldap.name=com.amazon.dlic.auth.ldap.backend
-logger.ldap.level=TRACE
-logger.ldap.appenderRef.capturing.ref = logCapturingAppender
+logger.ldap.level=warn
+#logger.ldap.appenderRef.capturing.ref = logCapturingAppender
+
+logger.securesslsettings.name=org.opensearch.security.ssl.SecureSSLSettings
+logger.securesslsettings.level=error
+
+logger.auditmessagerouter.name=org.opensearch.security.auditlog.routing.AuditMessageRouter
+logger.auditmessagerouter.level=error
\ No newline at end of file