File tree 2 files changed +8
-1
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle
plugins/examples/painless-whitelist
2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -34,6 +34,8 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
34
34
import org.elasticsearch.gradle.test.ErrorReportingTestListener
35
35
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
36
36
import org.elasticsearch.gradle.testclusters.TestClustersPlugin
37
+ import org.elasticsearch.gradle.testclusters.TestDistribution
38
+ import org.elasticsearch.gradle.tool.Boilerplate
37
39
import org.gradle.api.Action
38
40
import org.gradle.api.GradleException
39
41
import org.gradle.api.InvalidUserDataException
@@ -158,6 +160,7 @@ class BuildPlugin implements Plugin<Project> {
158
160
NamedDomainObjectContainer<ElasticsearchCluster > testClusters = project. extensions. findByName(TestClustersPlugin . EXTENSION_NAME ) as NamedDomainObjectContainer<ElasticsearchCluster >
159
161
if (testClusters != null ) {
160
162
testClusters. all { ElasticsearchCluster cluster ->
163
+ cluster. setTestDistribution(TestDistribution . DEFAULT )
161
164
cluster. systemProperty ' javax.net.ssl.trustStorePassword' , ' password'
162
165
cluster. systemProperty ' javax.net.ssl.keyStorePassword' , ' password'
163
166
// Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode
Original file line number Diff line number Diff line change 16
16
* specific language governing permissions and limitations
17
17
* under the License.
18
18
*/
19
+ import org.elasticsearch.gradle.info.BuildParams
20
+
19
21
apply plugin : ' elasticsearch.testclusters'
20
22
apply plugin : ' elasticsearch.esplugin'
21
23
@@ -33,7 +35,9 @@ dependencies {
33
35
}
34
36
35
37
testClusters. integTest {
36
- testDistribution = ' oss'
38
+ rootProject. globalInfo. ready {
39
+ testDistribution = BuildParams . inFipsJvm ? ' DEFAULT' : ' OSS'
40
+ }
37
41
}
38
42
39
43
test. enabled = false
You can’t perform that action at this time.
0 commit comments