File tree Expand file tree Collapse file tree 3 files changed +2
-10
lines changed
groovy/org/elasticsearch/gradle
java/org/elasticsearch/gradle/testclusters
plugins/examples/painless-whitelist Expand file tree Collapse file tree 3 files changed +2
-10
lines changed Original file line number Diff line number Diff line change @@ -34,8 +34,6 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
3434import org.elasticsearch.gradle.test.ErrorReportingTestListener
3535import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
3636import org.elasticsearch.gradle.testclusters.TestClustersPlugin
37- import org.elasticsearch.gradle.testclusters.TestDistribution
38- import org.elasticsearch.gradle.tool.Boilerplate
3937import org.gradle.api.Action
4038import org.gradle.api.GradleException
4139import 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
Original file line number Diff line number Diff 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 );
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-
2119apply plugin : ' elasticsearch.testclusters'
2220apply plugin : ' elasticsearch.esplugin'
2321
@@ -35,9 +33,7 @@ dependencies {
3533}
3634
3735testClusters. integTest {
38- rootProject. globalInfo. ready {
39- testDistribution = BuildParams . inFipsJvm ? ' DEFAULT' : ' OSS'
40- }
36+ testDistribution = ' oss'
4137}
4238
4339test. enabled = false
You can’t perform that action at this time.
0 commit comments