File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle
plugins/examples/painless-whitelist Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
3232import org.elasticsearch.gradle.test.ErrorReportingTestListener
3333import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
3434import org.elasticsearch.gradle.testclusters.TestClustersPlugin
35+ import org.elasticsearch.gradle.testclusters.TestDistribution
3536import org.elasticsearch.gradle.tool.Boilerplate
3637import org.gradle.api.Action
3738import org.gradle.api.GradleException
@@ -159,6 +160,7 @@ class BuildPlugin implements Plugin<Project> {
159160 for (File dep : project. getConfigurations(). getByName(" extraJars" ). getFiles()){
160161 cluster. extraJarFile(dep)
161162 }
163+ cluster. setTestDistribution(TestDistribution . DEFAULT )
162164 cluster. extraConfigFile(" fips_java.security" , securityProperties)
163165 cluster. extraConfigFile(" fips_java.policy" , securityPolicy)
164166 cluster. extraConfigFile(" cacerts.bcfks" , bcfksKeystore)
Original file line number Diff line number Diff line change 1616 * specific language governing permissions and limitations
1717 * under the License.
1818 */
19+ import org.elasticsearch.gradle.info.BuildParams
20+
1921apply plugin : ' elasticsearch.testclusters'
2022apply plugin : ' elasticsearch.esplugin'
2123
@@ -33,7 +35,7 @@ dependencies {
3335}
3436
3537testClusters. integTest {
36- testDistribution = ' oss '
38+ testDistribution = BuildParams . inFipsJvm ? ' DEFAULT ' : ' OSS '
3739}
3840
3941test. enabled = false
You can’t perform that action at this time.
0 commit comments