Remove with(out)-system-key tests #40547
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,21 @@ import org.elasticsearch.gradle.test.RestIntegTestTask | |
| import org.elasticsearch.gradle.Version | ||
|
|
||
| import java.nio.charset.StandardCharsets | ||
|
|
||
| // Apply the java plugin to this project so the sources can be edited in an IDE | ||
| apply plugin: 'elasticsearch.standalone-test' | ||
|
|
||
| unitTest.enabled = false | ||
|
|
||
| repositories { | ||
| maven { | ||
| url "https://artifacts.elastic.co/maven" | ||
| } | ||
| maven { | ||
| url "https://snapshots.elastic.co/maven" | ||
|
||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here | ||
| testCompile project(path: xpackModule('core'), configuration: 'default') | ||
|
|
@@ -70,8 +79,6 @@ Closure waitWithAuth = { NodeInfo node, AntBuilder ant -> | |
| return tmpFile.exists() | ||
| } | ||
|
|
||
| String coreFullClusterRestartPath = project(':qa:full-cluster-restart').projectDir.toPath().resolve('src/test/java').toString() | ||
| sourceSets { | ||
| test { | ||
|
|
@@ -90,223 +97,159 @@ forbiddenPatterns { | |
| } | ||
|
|
||
| // tests are pushed down to subprojects | ||
| testingConventions.enabled = false | ||
mark-vieira marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| String outputDir = "${buildDir}/generated-resources/${project.name}" | ||
|
|
||
| // 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' | ||
| } | ||
|
|
||
| task copyTestNodeKeyMaterial(type: Copy) { | ||
| from project(':x-pack:plugin:core').files('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.pem', | ||
| 'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.crt', | ||
| 'src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks') | ||
| into outputDir | ||
| } | ||
|
|
||
| for (Version version : bwcVersions.indexCompatible) { | ||
| String baseName = "v${version}" | ||
|
|
||
| Task oldClusterTest = tasks.create(name: "${baseName}#oldClusterTest", type: RestIntegTestTask) { | ||
| mustRunAfter(precommit) | ||
| } | ||
|
|
||
| Object extension = extensions.findByName("${baseName}#oldClusterTestCluster") | ||
| configure(extensions.findByName("${baseName}#oldClusterTestCluster")) { | ||
| dependsOn copyTestNodeKeyMaterial | ||
| if (version.before('6.3.0')) { | ||
| String depVersion = version; | ||
| if (project.bwcVersions.unreleased.contains(version)) { | ||
| depVersion += "-SNAPSHOT" | ||
| } | ||
| mavenPlugin 'x-pack', "org.elasticsearch.plugin:x-pack:${depVersion}" | ||
|
|
||
| } | ||
| bwcVersion = version | ||
| numBwcNodes = 2 | ||
| numNodes = 2 | ||
| clusterName = 'full-cluster-restart' | ||
| String usersCli = version.before('6.3.0') ? 'bin/x-pack/users' : 'bin/elasticsearch-users' | ||
| setupCommand 'setupTestUser', usersCli, 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' | ||
| waitCondition = waitWithAuth | ||
|
|
||
| // some tests rely on the translog not being flushed | ||
| setting 'indices.memory.shard_inactive_time', '20m' | ||
|
|
||
| setting 'xpack.security.enabled', 'true' | ||
| setting 'xpack.security.transport.ssl.enabled', 'true' | ||
| if (project.inFipsJvm) { | ||
| setting 'xpack.security.transport.ssl.key', 'testnode.pem' | ||
| setting 'xpack.security.transport.ssl.certificate', 'testnode.crt' | ||
| keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode' | ||
| } else { | ||
| setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks' | ||
| setting 'xpack.security.transport.ssl.keystore.password', 'testnode' | ||
| } | ||
| setting 'xpack.license.self_generated.type', 'trial' | ||
| dependsOn copyTestNodeKeyMaterial | ||
| extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem') | ||
| extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt') | ||
| extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') | ||
|
|
||
| keystoreFile 'xpack.watcher.encryption_key', "${project.projectDir}/src/test/resources/system_key" | ||
| setting 'xpack.watcher.encrypt_sensitive_data', 'true' | ||
| } | ||
|
|
||
| Task oldClusterTestRunner = tasks.getByName("${baseName}#oldClusterTestRunner") | ||
| 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") | ||
| exclude 'org/elasticsearch/upgrades/FullClusterRestartIT.class' | ||
| exclude 'org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.class' | ||
| exclude 'org/elasticsearch/upgrades/QueryBuilderBWCIT.class' | ||
| } | ||
|
|
||
| Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask) | ||
|
|
||
| configure(extensions.findByName("${baseName}#upgradedClusterTestCluster")) { | ||
| dependsOn oldClusterTestRunner, | ||
| "${baseName}#oldClusterTestCluster#node0.stop", | ||
| "${baseName}#oldClusterTestCluster#node1.stop" | ||
| numNodes = 2 | ||
| clusterName = 'full-cluster-restart' | ||
| dataDir = { nodeNum -> oldClusterTest.nodes[nodeNum].dataDir } | ||
| cleanShared = false // We want to keep snapshots made by the old cluster! | ||
| setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' | ||
| waitCondition = waitWithAuth | ||
|
|
||
| // some tests rely on the translog not being flushed | ||
| setting 'indices.memory.shard_inactive_time', '20m' | ||
| setting 'xpack.security.enabled', 'true' | ||
| if (project.inFipsJvm) { | ||
| setting 'xpack.security.transport.ssl.key', 'testnode.pem' | ||
| setting 'xpack.security.transport.ssl.certificate', 'testnode.crt' | ||
| keystoreSetting 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode' | ||
| } else { | ||
| setting 'xpack.security.transport.ssl.keystore.path', 'testnode.jks' | ||
| setting 'xpack.security.transport.ssl.keystore.password', 'testnode' | ||
| } | ||
| setting 'xpack.license.self_generated.type', 'trial' | ||
| dependsOn copyTestNodeKeyMaterial | ||
| extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') | ||
| extraConfigFile 'testnode.pem', new File(outputDir + '/testnode.pem') | ||
| extraConfigFile 'testnode.crt', new File(outputDir + '/testnode.crt') | ||
|
|
||
| setting 'xpack.watcher.encrypt_sensitive_data', 'true' | ||
| keystoreFile 'xpack.watcher.encryption_key', "${project.projectDir}/src/test/resources/system_key" | ||
| } | ||
|
|
||
| Task upgradedClusterTestRunner = tasks.getByName("${baseName}#upgradedClusterTestRunner") | ||
| 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") | ||
| exclude 'org/elasticsearch/upgrades/FullClusterRestartIT.class' | ||
| exclude 'org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.class' | ||
| exclude 'org/elasticsearch/upgrades/QueryBuilderBWCIT.class' | ||
| } | ||
|
|
||
| Task versionBwcTest = tasks.create(name: "${baseName}#bwcTest") { | ||
| dependsOn = [upgradedClusterTest] | ||
| } | ||
|
|
||
| if (project.bwc_tests_enabled) { | ||
| bwcTest.dependsOn(versionBwcTest) | ||
| } | ||
| } | ||
|
|
||
| // basic integ tests includes testing bwc against the most recent version | ||
| task bwcTestSnapshots { | ||
| if (project.bwc_tests_enabled) { | ||
| for (final def version : bwcVersions.unreleasedIndexCompatible) { | ||
| dependsOn "v${version}#bwcTest" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| check.dependsOn(bwcTestSnapshots) | ||
|
|
||
| // copy x-pack plugin info so it is on the classpath and security manager has the right permissions | ||
| task copyXPackRestSpec(type: Copy) { | ||
| dependsOn(project.configurations.restSpec, 'processTestResources') | ||
| from project(xpackModule('core')).sourceSets.test.resources | ||
| include 'rest-api-spec/api/**' | ||
| into project.sourceSets.test.output.resourcesDir | ||
| } | ||
|
|
||
| task copyXPackPluginProps(type: Copy) { | ||
| dependsOn(copyXPackRestSpec) | ||
| from project(xpackModule('core')).file('src/main/plugin-metadata') | ||
| from project(xpackModule('core')).tasks.pluginProperties | ||
| into outputDir | ||
| } | ||
| project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps) | ||
Empty file.
Empty file.
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.
Uh oh!
There was an error while loading. Please reload this page.