Skip to content

QA: System property to override distribution #30591

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 12 commits into from
May 15, 2018
Merged

QA: System property to override distribution #30591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1787e42
QA: System property to override distribution
nik9000 May 14, 2018
db8c1ef
Merge branch 'master' into qa_tests_distribution
nik9000 May 14, 2018
d2d384e
Update message
nik9000 May 14, 2018
5b64f0e
Drop skip change
nik9000 May 14, 2018
9cc15bd
Drop skip changes
nik9000 May 14, 2018
39440af
revert more
nik9000 May 14, 2018
6d9e590
Revert yet more
nik9000 May 14, 2018
f3ef5bf
Revert remaining
nik9000 May 14, 2018
8465558
Skip only if distribution is wrong
nik9000 May 14, 2018
62b0500
fix rank eval
nik9000 May 15, 2018
25c81a3
Add reproduce info
nik9000 May 15, 2018
d38e00a
track
nik9000 May 15, 2018
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
2 changes: 1 addition & 1 deletion qa/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
subprojects { Project subproj ->
subproj.tasks.withType(RestIntegTestTask) {
subproj.extensions.configure("${it.name}Cluster") { cluster ->
cluster.distribution = 'oss-zip'
cluster.distribution = System.getProperty('tests.distribution', 'oss-zip')
Copy link
Member Author

@nik9000 nik9000 May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first I thought this PR would be just this line. If only things were that simple....

Copy link
Member Author

@nik9000 nik9000 May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And now that I've reverted most of the rest, it is almost the only line!

}
}
}
9 changes: 8 additions & 1 deletion qa/mixed-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,16 @@ for (Version version : bwcVersions.wireCompatible) {
bwcTest.dependsOn(versionBwcTest)
}

/* To support taking index snapshots, we have to set path.repo setting */
tasks.getByName("${baseName}#mixedClusterTestRunner").configure {
/* To support taking index snapshots, we have to set path.repo setting */
systemProperty 'tests.path.repo', new File(buildDir, "cluster/shared/repo")
if ('zip'.equals(extension.distribution)) {
systemProperty 'tests.rest.blacklist', [
'cat.templates/10_basic/No templates',
'cat.templates/10_basic/Sort templates',
'cat.templates/10_basic/Multiple template',
].join(',')
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions qa/smoke-test-multinode/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,13 @@ integTest {
integTestCluster {
numNodes = 2
}

integTestRunner {
if ('zip'.equals(integTestCluster.distribution)) {
systemProperty 'tests.rest.blacklist', [
'cat.templates/10_basic/No templates',
'cat.templates/10_basic/Sort templates',
'cat.templates/10_basic/Multiple template',
].join(',')
}
}
8 changes: 8 additions & 0 deletions qa/smoke-test-rank-eval-with-mustache/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ dependencies {
testCompile project(path: ':modules:lang-mustache', configuration: 'runtime')
}

/*
* One of the integration tests doesn't work with the zip distribution
Copy link
Member

@rjernst rjernst May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you open an issue for this so it is tracked and link it in this code comment?

Copy link
Member Author

@nik9000 nik9000 May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely.

* and will be fixed later.
* Tracked by https://github.com/elastic/elasticsearch/issues/30628
*/
if ("zip".equals(integTestCluster.distribution)) {
integTestRunner.enabled = false
}
1 change: 1 addition & 0 deletions .../framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public ReproduceErrorMessageBuilder appendESProperties() {
}
appendOpt("tests.locale", Locale.getDefault().toLanguageTag());
appendOpt("tests.timezone", TimeZone.getDefault().getID());
appendOpt("tests.distribution", System.getProperty("tests.distribution"));
Copy link
Member Author

@nik9000 nik9000 May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you override the distribution on the command line then it is important to override it again. If you don't override it on the command line then setting this environment variable does nothing which is fine.

return this;
}

Expand Down