Skip to content

Commit 792a111

Browse files
committed
Revert "Always test against default distribution when in a FIPS JVM (#51273)"
This reverts commit 0169498. This reverts commit c5a032b.
1 parent f104996 commit 792a111

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ 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
3937
import org.gradle.api.Action
4038
import org.gradle.api.GradleException
4139
import org.gradle.api.InvalidUserDataException
@@ -160,7 +158,6 @@ class BuildPlugin implements Plugin<Project> {
160158
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = project.extensions.findByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster>
161159
if (testClusters != null) {
162160
testClusters.all { ElasticsearchCluster cluster ->
163-
cluster.setTestDistribution(TestDistribution.DEFAULT)
164161
cluster.systemProperty 'javax.net.ssl.trustStorePassword', 'password'
165162
cluster.systemProperty 'javax.net.ssl.keyStorePassword', 'password'
166163
// Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@ List<ElasticsearchDistribution> getDistributions() {
232232
@Override
233233
public void setTestDistribution(TestDistribution testDistribution) {
234234
requireNonNull(testDistribution, "null distribution passed when configuring test cluster `" + this + "`");
235-
// TODO: Uncomment this workaround once we remove all the globalInfo.ready { } stuff
236-
// checkFrozen();
235+
checkFrozen();
237236
this.testDistribution = testDistribution;
238237
for (ElasticsearchDistribution distribution : distributions) {
239238
setDistributionType(distribution, testDistribution);

plugins/examples/painless-whitelist/build.gradle

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

@@ -35,9 +33,7 @@ dependencies {
3533
}
3634

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

4339
test.enabled = false

0 commit comments

Comments
 (0)