Skip to content

REST API compat testing - remove the requirement for default distro #71119

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 31, 2021
Merged

REST API compat testing - remove the requirement for default distro #71119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a524b21
remove the requirement for default distro
jakelandis Mar 31, 2021
958fc38
enable bwc for CI --> will revert this commit
jakelandis Mar 31, 2021
e7753b4
fix imports
jakelandis Mar 31, 2021
efeb470
fix integ test
jakelandis Mar 31, 2021
3080fde
Revert "enable bwc for CI --> will revert this commit"
jakelandis Mar 31, 2021
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
8 changes: 1 addition & 7 deletions ...Src/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {

// avoids a dependency problem in this test, the distribution in use here is inconsequential to the test
import org.elasticsearch.gradle.testclusters.TestDistribution;
testClusters {
yamlRestCompatTest.setTestDistribution(TestDistribution.INTEG_TEST)
}

dependencies {
yamlRestTestImplementation "junit:junit:4.12"
Expand Down Expand Up @@ -198,10 +195,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {

// avoids a dependency problem in this test, the distribution in use here is inconsequential to the test
import org.elasticsearch.gradle.testclusters.TestDistribution;
testClusters {
yamlRestCompatTest.setTestDistribution(TestDistribution.INTEG_TEST)
}


dependencies {
yamlRestTestImplementation "junit:junit:4.12"
}
Expand Down
7 changes: 0 additions & 7 deletions ...src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
import org.elasticsearch.gradle.test.rest.RestResourcesPlugin;
import org.elasticsearch.gradle.test.rest.RestTestUtil;
import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin;
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster;
import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
import org.elasticsearch.gradle.testclusters.TestDistribution;
import org.elasticsearch.gradle.util.GradleUtils;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
Expand All @@ -39,7 +37,6 @@
import java.nio.file.Path;
import java.util.Map;

import static org.elasticsearch.gradle.test.rest.RestTestUtil.createTestCluster;
import static org.elasticsearch.gradle.test.rest.RestTestUtil.setupDependencies;

/**
Expand Down Expand Up @@ -75,10 +72,6 @@ public void apply(Project project) {
SourceSet yamlTestSourceSet = sourceSets.getByName(YamlRestTestPlugin.SOURCE_SET_NAME);
GradleUtils.extendSourceSet(project, YamlRestTestPlugin.SOURCE_SET_NAME, SOURCE_SET_NAME);

// create the test cluster container, and always use the default distribution
ElasticsearchCluster testCluster = createTestCluster(project, yamlCompatTestSourceSet);
testCluster.setTestDistribution(TestDistribution.DEFAULT);

// copy compatible rest specs
Configuration bwcMinorConfig = project.getConfigurations().create("bwcMinor");
Dependency bwcMinor = project.getDependencies().project(Map.of("path", ":distribution:bwc:minor", "configuration", "checkout"));
Expand Down