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.

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

Do not create unused testCluster #77581

Merged
merged 30 commits into from
Sep 23, 2021
Merged

Do not create unused testCluster #77581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e85c8f2
Do not create unused testCluster
breskeby Sep 10, 2021
ff5ea3a
Do not fail on run task (debug)
breskeby Sep 10, 2021
44b6f78
Create more test cluster lazy
breskeby Sep 10, 2021
f1a12d9
Make more test cluster lazy
breskeby Sep 11, 2021
45ced90
Avoid creating unused testcluster
breskeby Sep 13, 2021
11d05e3
Fix PluginBuildPlugin
breskeby Sep 13, 2021
c53c242
Fix disabling geo db download
breskeby Sep 13, 2021
6d70cab
Fix cluster setup in repository-multi-version
breskeby Sep 13, 2021
6b9298d
Polishing
breskeby Sep 13, 2021
4dcfde8
Fix issue with irretic groovy ogic
breskeby Sep 13, 2021
2ee6420
Fix bwc tests
breskeby Sep 13, 2021
32d6688
Fix more bwcTests
breskeby Sep 13, 2021
1a803ff
Fix more bwc tests
breskeby Sep 13, 2021
b31c6d7
Fix more bwc tests
breskeby Sep 13, 2021
b701692
Fix more bwc tests
breskeby Sep 13, 2021
65aa706
Fix typo
breskeby Sep 13, 2021
fd9139a
Minor polishing
breskeby Sep 13, 2021
3695edd
Fix rolling upgrade tests
breskeby Sep 16, 2021
d1974a5
Fix cluster config in sql qa mixedcluster project
breskeby Sep 20, 2021
54aa231
Fix more bwc tests
breskeby Sep 20, 2021
cf33648
Clean up before review
breskeby Sep 21, 2021
e05e5c2
Document test cluster usage
breskeby Sep 21, 2021
23f1fab
Api polising after Review
breskeby Sep 22, 2021
f7dab15
Allow gradle provider as value for nonSystemProperties
breskeby Sep 22, 2021
9d76d4b
Some simplification on test configuration
breskeby Sep 22, 2021
5bd6919
Fix typo in rest test config
breskeby Sep 22, 2021
92a11c5
Fix more typos
breskeby Sep 22, 2021
7a00e4c
Fix another typo
breskeby Sep 22, 2021
69e3d1a
Fix more typos
breskeby Sep 22, 2021
1fd16dd
Merge branch 'master' into create-less-unused-cluster
breskeby Sep 23, 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
Prev Previous commit
Next Next commit
Some simplification on test configuration
  • Loading branch information
@breskeby
breskeby committed Sep 22, 2021
commit 9d76d4bae52a341dac270d6cff6f8e9fcad4390a
2 changes: 1 addition & 1 deletion qa/full-cluster-restart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
it.systemProperty 'tests.old_cluster_version', oldVersion
it.systemProperty 'tests.path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
it.nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
it.nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
it.nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register(bwcTaskName(bwcVersion)) {
Expand Down
2 changes: 1 addition & 1 deletion qa/mixed-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
baseCluster.get().nextNodeToNextVersion()

nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
}
systemProperty 'tests.path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
onlyIf { project.bwc_tests_enabled }
Expand Down
2 changes: 1 addition & 1 deletion qa/repository-multi-version/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
it.systemProperty 'tests.path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
def clusterName = it.name.contains("Step2") || it.name.contains("Step4") ? "${newClusterName}" : "${oldClusterName}"
it.nonInputProperties.systemProperty('tests.rest.cluster', testClusters.named(clusterName).map(c -> c.allHttpSocketURI.join(",")))
it.nonInputProperties.systemProperty('tests.clustername', testClusters.named(clusterName).map(c -> c.getName()))
it.nonInputProperties.systemProperty('tests.clustername', clusterName)
}

tasks.register(bwcTaskName(bwcVersion)) {
Expand Down
8 changes: 4 additions & 4 deletions qa/rolling-upgrade/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
systemProperty 'tests.rest.suite', 'old_cluster'
systemProperty 'tests.upgrade_from_version', oldVersion
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register("${baseName}#oneThirdUpgradedTest", StandaloneRestIntegTestTask) {
Expand All @@ -67,7 +67,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
systemProperty 'tests.upgrade_from_version', oldVersion
systemProperty 'tests.first_round', 'true'
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register("${baseName}#twoThirdsUpgradedTest", StandaloneRestIntegTestTask) {
Expand All @@ -80,7 +80,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
systemProperty 'tests.upgrade_from_version', oldVersion
systemProperty 'tests.first_round', 'false'
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register("${baseName}#upgradedClusterTest", StandaloneRestIntegTestTask) {
Expand All @@ -92,7 +92,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
systemProperty 'tests.rest.suite', 'upgraded_cluster'
systemProperty 'tests.upgrade_from_version', oldVersion
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register(bwcTaskName(bwcVersion)) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/full-cluster-restart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) {
it.systemProperty 'tests.old_cluster_version', oldVersion
it.systemProperty 'tests.path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
it.nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
it.nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c -> c.getName()))
it.nonInputProperties.systemProperty('tests.clustername', baseName)
}

tasks.register(bwcTaskName(bwcVersion)) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/rolling-upgrade-multi-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
baseCluster.nextNodeToNextVersion()
}
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c->c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseCluster.map(c->c.getName()))
nonInputProperties.systemProperty('tests.clustername', baseName)
nonInputProperties.systemProperty('tests.leader_host', baseLeaderCluster.map(c->c.allHttpSocketURI.last()))
nonInputProperties.systemProperty('tests.leader_remote_cluster_seed', baseLeaderCluster.map(c -> c.allTransportPortURI.last()))
nonInputProperties.systemProperty('tests.follower_host', baseFollowerCluster.map(c -> c.allHttpSocketURI.last()))
Expand Down