honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Always test against default distribution when in a FIPS JVM (#51273)" 

This reverts commit 0169498711.
This reverts commit c5a032b594.
This commit is contained in:
Mark Vieira 2020-01-22 12:15:24 -08:00
parent 0169498711
commit c08c282c0e
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -34,8 +34,6 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
import org.elasticsearch.gradle.test.ErrorReportingTestListener import org.elasticsearch.gradle.test.ErrorReportingTestListener
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
import org.elasticsearch.gradle.testclusters.TestClustersPlugin import org.elasticsearch.gradle.testclusters.TestClustersPlugin
import org.elasticsearch.gradle.testclusters.TestDistribution
import org.elasticsearch.gradle.tool.Boilerplate
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.GradleException import org.gradle.api.GradleException
import org.gradle.api.InvalidUserDataException import org.gradle.api.InvalidUserDataException
@ -160,7 +158,6 @@ class BuildPlugin implements Plugin<Project> {
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = project.extensions.findByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster> NamedDomainObjectContainer<ElasticsearchCluster> testClusters = project.extensions.findByName(TestClustersPlugin.EXTENSION_NAME) as NamedDomainObjectContainer<ElasticsearchCluster>
if (testClusters != null) { if (testClusters != null) {
testClusters.all { ElasticsearchCluster cluster -> testClusters.all { ElasticsearchCluster cluster ->
cluster.setTestDistribution(TestDistribution.DEFAULT)
cluster.systemProperty 'javax.net.ssl.trustStorePassword', 'password' cluster.systemProperty 'javax.net.ssl.trustStorePassword', 'password'
cluster.systemProperty 'javax.net.ssl.keyStorePassword', 'password' cluster.systemProperty 'javax.net.ssl.keyStorePassword', 'password'
// Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode // Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode

3
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View File

@ -232,8 +232,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
@Override @Override
public void setTestDistribution(TestDistribution testDistribution) { public void setTestDistribution(TestDistribution testDistribution) {
requireNonNull(testDistribution, "null distribution passed when configuring test cluster `" + this + "`"); requireNonNull(testDistribution, "null distribution passed when configuring test cluster `" + this + "`");
// TODO: Uncomment this workaround once we remove all the globalInfo.ready { } stuff checkFrozen();
// checkFrozen();
this.testDistribution = testDistribution; this.testDistribution = testDistribution;
for (ElasticsearchDistribution distribution : distributions) { for (ElasticsearchDistribution distribution : distributions) {
setDistributionType(distribution, testDistribution); setDistributionType(distribution, testDistribution);

6
plugins/examples/painless-whitelist/build.gradle
View File

@ -16,8 +16,6 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import org.elasticsearch.gradle.info.BuildParams
apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.esplugin'
@ -35,9 +33,7 @@ dependencies {
} }
testClusters.integTest { testClusters.integTest {
rootProject.globalInfo.ready { testDistribution = 'oss'
testDistribution = BuildParams.inFipsJvm ? 'DEFAULT' : 'OSS'
}
} }
test.enabled = false test.enabled = false