Merge branch '3.0.x'

This commit is contained in:
Ryan Baxter
2023-08-22 11:29:03 -07:00
2 changed files with 5 additions and 3 deletions

View File

@@ -8,9 +8,9 @@ runs:
run: |
# find all the tests that are supposed to be run, but don't actually run them.
# this is achieved via: 'spring.cloud.k8s.skip.tests=true' in DisabledTestsCondition
./mvnw clean install -B -Dskip.build.image=true -Dspring.cloud.k8s.skip.tests=true \
./mvnw test -B -Dskip.build.image=true -Dspring.cloud.k8s.skip.tests=true \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=error \
-T 1C > /tmp/tests.txt
-T 1C -q > /tmp/tests.txt
- name: show result
if: always()

View File

@@ -37,9 +37,11 @@ import org.junit.jupiter.api.extension.ExtensionContext;
*/
public class DisabledTestsCondition implements ExecutionCondition {
private static final boolean SKIP_RUNNING_TESTS = "true".equals(System.getProperty("spring.cloud.k8s.skip.tests"));
@Override
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
if ("true".equals(System.getProperty("spring.cloud.k8s.skip.tests"))) {
if (SKIP_RUNNING_TESTS) {
System.out.println(
"\nspring.cloud.k8s.test.to.run -> " + extensionContext.getRequiredTestClass().getName() + " \n");
return ConditionEvaluationResult.disabled("");