-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Begin replacing static index tests with full restart tests #24846
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.elasticsearch.gradle.test.RestIntegTestTask | ||
| import org.elasticsearch.gradle.Version | ||
|
|
||
| apply plugin: 'elasticsearch.standalone-test' | ||
|
|
||
| // This is a top level task which we will add dependencies to below. | ||
| // It is a single task that can be used to backcompat tests against all versions. | ||
| task bwcTest { | ||
| description = 'Runs backwards compatibility tests.' | ||
| group = 'verification' | ||
| } | ||
|
|
||
| for (Version version : indexCompatVersions) { | ||
| String baseName = "v${version}" | ||
|
|
||
| Task oldClusterTest = tasks.create(name: "${baseName}#oldClusterTest", type: RestIntegTestTask) { | ||
| mustRunAfter(precommit) | ||
| } | ||
| tasks.getByName("${baseName}#oldClusterTestRunner").configure { | ||
| systemProperty 'tests.is_old_cluster', 'true' | ||
| systemProperty 'tests.old_cluster_version', version.toString().minus("-SNAPSHOT") | ||
| systemProperty 'tests.path.repo', new File(buildDir, "cluster/shared/repo") | ||
| } | ||
|
|
||
| Object extension = extensions.findByName("${baseName}#oldClusterTestCluster") | ||
| configure(extensions.findByName("${baseName}#oldClusterTestCluster")) { | ||
| distribution = 'zip' | ||
| bwcVersion = version | ||
| numBwcNodes = 2 | ||
| numNodes = 2 | ||
| clusterName = 'full-cluster-restart' | ||
| if (version.onOrAfter('5.3.0')) { | ||
| setting 'http.content_type.required', 'true' | ||
| } | ||
| } | ||
|
|
||
|
|
||
| Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask) { | ||
| dependsOn(oldClusterTest, "${baseName}#oldClusterTestCluster#node0.stop") | ||
| } | ||
|
|
||
| configure(extensions.findByName("${baseName}#upgradedClusterTestCluster")) { | ||
| dependsOn oldClusterTest, | ||
| "${baseName}#oldClusterTestCluster#node0.stop", | ||
| "${baseName}#oldClusterTestCluster#node1.stop" | ||
| distribution = 'zip' | ||
| clusterName = 'full-cluster-restart' | ||
| numNodes = 2 | ||
| dataDir = { nodeNum -> oldClusterTest.nodes[nodeNum].dataDir } | ||
| } | ||
|
|
||
| tasks.getByName("${baseName}#upgradedClusterTestRunner").configure { | ||
| systemProperty 'tests.is_old_cluster', 'false' | ||
| systemProperty 'tests.old_cluster_version', version.toString().minus("-SNAPSHOT") | ||
| systemProperty 'tests.path.repo', new File(buildDir, "cluster/shared/repo") | ||
| } | ||
|
|
||
| Task versionBwcTest = tasks.create(name: "${baseName}#bwcTest") { | ||
| dependsOn = [upgradedClusterTest] | ||
| } | ||
|
|
||
| /* Delay this change because the task we need to modify isn't created until | ||
| * after projects are evaluated. */ | ||
| gradle.projectsEvaluated { | ||
| // Disable cleaning the repository so we can test loading a snapshot | ||
| tasks.getByName("${baseName}#upgradedClusterTestCluster#prepareCluster.cleanShared").enabled = false | ||
| } | ||
|
|
||
| bwcTest.dependsOn(versionBwcTest) | ||
| } | ||
|
|
||
| test.enabled = false // no unit tests for rolling upgrades, only the rest integration test | ||
|
|
||
| // basic integ tests includes testing bwc against the most recent version | ||
| task integTest { | ||
| dependsOn = ["v${indexCompatVersions[-1]}#bwcTest"] | ||
| } | ||
|
|
||
| check.dependsOn(integTest) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is kind of sneaky...maybe have a flag on cluster configuration that means "don't create a shared clean task"? Something about "reuse"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll open a followup for this.