Merge branch 'master' into fixRunJobLogsFromManifestArtifact

keiko-redis-spring/keiko-redis-spring.gradle

@@ -11,5 +11,6 @@ dependencies {
   testImplementation "org.assertj:assertj-core"
   testImplementation("io.spinnaker.kork:kork-jedis-test")
 
+  testRuntimeOnly "ch.qos.logback:logback-classic"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }

keiko-redis/keiko-redis.gradle

@@ -11,4 +11,5 @@ dependencies {
 
   testImplementation project(":keiko-tck")
   testImplementation "io.spinnaker.kork:kork-jedis-test"
+  testRuntimeOnly "ch.qos.logback:logback-classic"
 }

keiko-redis/src/test/resources/logback.xml

@@ -0,0 +1,36 @@
+<!--
+
+    Copyright 2024 Salesforce, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<configuration>
+
+    <!-- see https://java.testcontainers.org/supported_docker_environment/logging_config/ -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+    <logger name="tc" level="INFO"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
+    <logger name="wiremock.org.eclipse.jetty" level="INFO"/>
+</configuration>