Spring/spring-pulsar
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable retry test plugin on CI

Browse Source
This commit is contained in:
Chris Bono
2023-02-03 17:07:45 -06:00
parent f804771658
commit f211a3490b
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
buildSrc/src/main/java/org/springframework/boot/gradle/JavaConventionsPlugin.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -49,8 +49,6 @@ import org.gradle.api.tasks.testing.Test;
import org.gradle.api.tasks.testing.logging.TestExceptionFormat; import org.gradle.api.tasks.testing.logging.TestExceptionFormat;
import org.gradle.api.tasks.testing.logging.TestLogEvent; import org.gradle.api.tasks.testing.logging.TestLogEvent;
import org.gradle.external.javadoc.CoreJavadocOptions; import org.gradle.external.javadoc.CoreJavadocOptions;
import org.gradle.testretry.TestRetryPlugin;
import org.gradle.testretry.TestRetryTaskExtension;
import org.springframework.boot.gradle.classpath.CheckClasspathForProhibitedDependencies; import org.springframework.boot.gradle.classpath.CheckClasspathForProhibitedDependencies;
import org.springframework.boot.gradle.optional.OptionalDependenciesPlugin; import org.springframework.boot.gradle.optional.OptionalDependenciesPlugin;
@@ -66,8 +64,7 @@ import org.springframework.util.StringUtils;
* <ul> * <ul>
* <li>The project is configured with source and target compatibility of 17 * <li>The project is configured with source and target compatibility of 17
* <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin * <li>{@link SpringJavaFormatPlugin Spring Java Format}, {@link CheckstylePlugin
* Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test * Checkstyle} and {@link TestFailuresPlugin Test Failures}.
* Retry} plugins are applied
* <li>{@link Test} tasks are configured: * <li>{@link Test} tasks are configured:
* <ul> * <ul>
* <li>to use JUnit Platform * <li>to use JUnit Platform
@@ -183,17 +180,6 @@ public class JavaConventionsPlugin implements Plugin<Project> {
}); });
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies() project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher")); .add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
project.getPlugins().apply(TestRetryPlugin.class);
project.getTasks().withType(Test.class,
(test) -> project.getPlugins().withType(TestRetryPlugin.class, (testRetryPlugin) -> {
TestRetryTaskExtension testRetry = test.getExtensions().getByType(TestRetryTaskExtension.class);
testRetry.getFailOnPassedAfterRetry().set(true);
testRetry.getMaxRetries().set(isCi() ? 3 : 0);
}));
}
private boolean isCi() {
return Boolean.parseBoolean(System.getenv("CI"));
} }
private void configureJavadocConventions(Project project) { private void configureJavadocConventions(Project project) {