Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testclusters: implement starting, waiting for and stopping single cluster nodes #35599

Merged
merged 18 commits into from
Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ if (project != rootProject) {
apply plugin: 'nebula.maven-base-publish'
apply plugin: 'nebula.maven-scm'

// we need to apply these again to override the build plugin
targetCompatibility = "10"
alpar-t marked this conversation as resolved.
Show resolved Hide resolved
sourceCompatibility = "10"

// groovydoc succeeds, but has some weird internal exception...
groovydoc.enabled = false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class PrecommitTasks {
private static Task configureNamingConventions(Project project) {
if (project.sourceSets.findByName("test")) {
Task namingConventionsTask = project.tasks.create('namingConventions', NamingConventionsTask)
namingConventionsTask.javaHome = project.runtimeJavaHome
namingConventionsTask.javaHome = project.compilerJavaHome
alpar-t marked this conversation as resolved.
Show resolved Hide resolved
return namingConventionsTask
}
return null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*/
public class GradleServicesAdapter {

public final Project project;
private final Project project;

public GradleServicesAdapter(Project project) {
this.project = project;
Expand Down
14 changes: 10 additions & 4 deletions buildSrc/src/main/java/org/elasticsearch/gradle/Distribution.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,23 @@

public enum Distribution {

INTEG_TEST("integ-test"),
ZIP("elasticsearch"),
ZIP_OSS("elasticsearch-oss");
INTEG_TEST("integ-test", "zip"),
ZIP("elasticsearch", "zip"),
ZIP_OSS("elasticsearch-oss", "zip");

private final String fileName;
private final String fileExtension;

Distribution(String name) {
Distribution(String name, String fileExtension) {
this.fileName = name;
this.fileExtension = fileExtension;
}

public String getFileName() {
return fileName;
}

public String getFileExtension() {
return fileExtension;
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.elasticsearch.gradle.precommit;

import org.elasticsearch.gradle.LoggedExec;
import org.elasticsearch.test.NamingConventionsCheck;
import org.elasticsearch.gradle.test.NamingConventionsCheck;
import org.gradle.api.GradleException;
import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.JavaPluginConvention;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.test;
package org.elasticsearch.gradle.test;
alpar-t marked this conversation as resolved.
Show resolved Hide resolved

import java.io.File;
import java.io.IOException;
Expand Down
Loading