Skip to content

Commit 6379899

Browse files
committed
Always test against default distribution when in a FIPS JVM (#51273)
(cherry picked from commit e34d7fd)
1 parent da2277e commit 6379899

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
3434
import org.elasticsearch.gradle.test.ErrorReportingTestListener
3535
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
3636
import org.elasticsearch.gradle.testclusters.TestClustersPlugin
37+
import org.elasticsearch.gradle.testclusters.TestDistribution
38+
import org.elasticsearch.gradle.tool.Boilerplate
3739
import org.gradle.api.Action
3840
import org.gradle.api.GradleException
3941
import org.gradle.api.InvalidUserDataException
@@ -158,6 +160,7 @@ class BuildPlugin implements Plugin<Project> {
158160
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = project.extensions.findByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster>
159161
if (testClusters != null) {
160162
testClusters.all { ElasticsearchCluster cluster ->
163+
cluster.setTestDistribution(TestDistribution.DEFAULT)
161164
cluster.systemProperty 'javax.net.ssl.trustStorePassword', 'password'
162165
cluster.systemProperty 'javax.net.ssl.keyStorePassword', 'password'
163166
// Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode

plugins/examples/painless-whitelist/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
import org.elasticsearch.gradle.info.BuildParams
20+
1921
apply plugin: 'elasticsearch.testclusters'
2022
apply plugin: 'elasticsearch.esplugin'
2123

@@ -33,7 +35,9 @@ dependencies {
3335
}
3436

3537
testClusters.integTest {
36-
testDistribution = 'oss'
38+
rootProject.globalInfo.ready {
39+
testDistribution = BuildParams.inFipsJvm ? 'DEFAULT' : 'OSS'
40+
}
3741
}
3842

3943
test.enabled = false

0 commit comments

Comments
 (0)