mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-08 22:14:59 +00:00
This commit creates a new Gradle plugin to provide a separate task name and source set for running YAML based REST tests. The only project converted to use the new plugin in this PR is distribution/archives/integ-test-zip. For which the testing has been moved to :rest-api-spec since it makes the most sense and it avoids a small but awkward change to the distribution plugin. The remaining cases in modules, plugins, and x-pack will be handled in followups. This plugin is distinctly different from the plugin introduced in #55896 since the YAML REST tests are intended to be black box tests over HTTP. As such they should not (by default) have access to the classpath for that which they are testing. The YAML based REST tests will be moved to separate source sets (yamlRestTest). The which source is the target for the test resources is dependent on if this new plugin is applied. If it is not applied, it will default to the test source set. Further, this introduces a breaking change for plugin developers that use the YAML testing framework. They will now need to either use the new source set and matching task, or configure the rest resources to use the old "test" source set that matches the old integTest task. (The former should be preferred). As part of this change (which is also breaking for plugin developers) the rest resources plugin has been removed from the build plugin and now requires either explicit application or application via the new YAML REST test plugin. Plugin developers should be able to fix the breaking changes to the YAML tests by adding apply plugin: 'elasticsearch.yaml-rest-test' and moving the YAML tests under a yamlRestTest folder (instead of test)
172 lines
6.6 KiB
Groovy
172 lines
6.6 KiB
Groovy
import org.elasticsearch.gradle.LoggedExec
|
|
import org.elasticsearch.gradle.info.BuildParams
|
|
import org.elasticsearch.gradle.plugin.PluginBuildPlugin
|
|
import org.gradle.internal.jvm.Jvm
|
|
|
|
import java.nio.charset.StandardCharsets
|
|
|
|
apply plugin: 'elasticsearch.testclusters'
|
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
|
apply plugin: 'elasticsearch.rest-test'
|
|
apply plugin: 'elasticsearch.rest-resources'
|
|
apply plugin: 'elasticsearch.validate-rest-spec'
|
|
|
|
archivesBaseName = 'x-pack'
|
|
|
|
dependencies {
|
|
testImplementation project(xpackModule('core')) // this redundant dependency is here to make IntelliJ happy
|
|
testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
|
|
}
|
|
|
|
subprojects {
|
|
afterEvaluate {
|
|
if (project.plugins.hasPlugin(PluginBuildPlugin)) {
|
|
// see the root Gradle file for additional logic regarding this configuration
|
|
project.configurations.create('featureAwarePlugin')
|
|
project.dependencies.add('featureAwarePlugin', project.configurations.compileClasspath)
|
|
project.dependencies.add('featureAwarePlugin', project(':x-pack:test:feature-aware'))
|
|
project.dependencies.add('featureAwarePlugin', project.sourceSets.main.output.getClassesDirs())
|
|
|
|
File successMarker = file("$buildDir/markers/featureAware")
|
|
task featureAwareCheck(type: LoggedExec) {
|
|
description = "Runs FeatureAwareCheck on main classes."
|
|
dependsOn project.configurations.featureAwarePlugin
|
|
outputs.file(successMarker)
|
|
|
|
executable = "${Jvm.current().javaHome}/bin/java"
|
|
|
|
// default to main class files if such a source set exists
|
|
final List files = []
|
|
if (project.sourceSets.findByName("main")) {
|
|
files.add(project.sourceSets.main.output.classesDirs)
|
|
dependsOn project.tasks.classes
|
|
}
|
|
// filter out non-existent classes directories from empty source sets
|
|
final FileCollection classDirectories = project.files(files).filter { it.exists() }
|
|
|
|
doFirst {
|
|
args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
|
|
classDirectories.each { args it.getAbsolutePath() }
|
|
}
|
|
doLast {
|
|
successMarker.parentFile.mkdirs()
|
|
successMarker.setText("", 'UTF-8')
|
|
}
|
|
}
|
|
|
|
project.precommit.dependsOn featureAwareCheck
|
|
}
|
|
}
|
|
}
|
|
|
|
configurations {
|
|
testArtifacts.extendsFrom testRuntime
|
|
testArtifacts.extendsFrom testImplementation
|
|
}
|
|
|
|
restResources {
|
|
restApi {
|
|
includeCore '*'
|
|
}
|
|
}
|
|
|
|
artifacts {
|
|
restXpackSpecs(new File(projectDir, "src/test/resources/rest-api-spec/api"))
|
|
restXpackTests(new File(projectDir, "src/test/resources/rest-api-spec/test"))
|
|
}
|
|
|
|
task testJar(type: Jar) {
|
|
appendix 'test'
|
|
from sourceSets.test.output
|
|
/*
|
|
* Stick the license and notice file in the jar. This isn't strictly
|
|
* needed because we don't publish it but it makes our super-paranoid
|
|
* tests happy.
|
|
*/
|
|
metaInf {
|
|
from(project.licenseFile.parent) {
|
|
include project.licenseFile.name
|
|
rename { 'LICENSE.txt' }
|
|
}
|
|
from(project.noticeFile.parent) {
|
|
include project.noticeFile.name
|
|
}
|
|
}
|
|
}
|
|
artifacts {
|
|
testArtifacts testJar
|
|
}
|
|
|
|
// location for keys and certificates
|
|
File keystoreDir = file("$buildDir/keystore")
|
|
File nodeKey = file("$keystoreDir/testnode.pem")
|
|
File nodeCert = file("$keystoreDir/testnode.crt")
|
|
|
|
// Add key and certs to test classpath: it expects them there
|
|
// User cert and key PEM files instead of a JKS Keystore for the cluster's trust material so that
|
|
// it can run in a FIPS 140 JVM
|
|
// TODO: Remove all existing uses of cross project file references when the new approach for referencing static files is available
|
|
// https://github.com/elastic/elasticsearch/pull/32201
|
|
task copyKeyCerts(type: Copy) {
|
|
from(project(':x-pack:plugin:core').file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/')) {
|
|
include 'testnode.crt', 'testnode.pem'
|
|
}
|
|
into keystoreDir
|
|
}
|
|
// Add keystores to test classpath: it expects it there
|
|
sourceSets.test.resources.srcDir(keystoreDir)
|
|
processTestResources.dependsOn(copyKeyCerts)
|
|
|
|
integTest.runner {
|
|
/*
|
|
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
|
|
* other if we allow them to set the number of available processors as it's set-once in Netty.
|
|
*/
|
|
systemProperty 'es.set.netty.runtime.available.processors', 'false'
|
|
|
|
|
|
// TODO: fix this rest test to not depend on a hardcoded port!
|
|
def blacklist = ['getting_started/10_monitor_cluster_health/*']
|
|
if (BuildParams.isSnapshotBuild() == false) {
|
|
// these tests attempt to install basic/internal licenses signed against the dev/public.key
|
|
// Since there is no infrastructure in place (anytime soon) to generate licenses using the production
|
|
// private key, these tests are blacklisted in non-snapshot test runs
|
|
blacklist.addAll(['xpack/15_basic/*', 'license/20_put_license/*', 'license/30_enterprise_license/*'])
|
|
}
|
|
systemProperty 'tests.rest.blacklist', blacklist.join(',')
|
|
dependsOn copyKeyCerts
|
|
}
|
|
|
|
testClusters.integTest {
|
|
testDistribution = 'DEFAULT' // this is important since we use the reindex module in ML
|
|
setting 'xpack.ml.enabled', 'true'
|
|
setting 'xpack.security.enabled', 'true'
|
|
setting 'xpack.watcher.enabled', 'false'
|
|
// Integration tests are supposed to enable/disable exporters before/after each test
|
|
setting 'xpack.monitoring.exporters._local.type', 'local'
|
|
setting 'xpack.monitoring.exporters._local.enabled', 'false'
|
|
setting 'xpack.security.authc.token.enabled', 'true'
|
|
setting 'xpack.security.authc.api_key.enabled', 'true'
|
|
setting 'xpack.security.transport.ssl.enabled', 'true'
|
|
setting 'xpack.security.transport.ssl.key', nodeKey.name
|
|
setting 'xpack.security.transport.ssl.certificate', nodeCert.name
|
|
setting 'xpack.security.transport.ssl.verification_mode', 'certificate'
|
|
setting 'xpack.security.audit.enabled', 'true'
|
|
setting 'xpack.license.self_generated.type', 'trial'
|
|
// disable ILM history, since it disturbs tests using _all
|
|
setting 'indices.lifecycle.history_index_enabled', 'false'
|
|
keystore 'bootstrap.password', 'x-pack-test-password'
|
|
keystore 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
|
|
|
|
user username: "x_pack_rest_user", password: "x-pack-test-password"
|
|
user username: "cat_test_user", password: "cat-test-password", role: "cat_test_role"
|
|
extraConfigFile nodeKey.name, nodeKey
|
|
extraConfigFile nodeCert.name, nodeCert
|
|
extraConfigFile 'roles.yml', file('src/test/resources/roles.yml')
|
|
if (BuildParams.isSnapshotBuild() == false) {
|
|
systemProperty 'es.searchable_snapshots_feature_enabled', 'true'
|
|
}
|
|
}
|
|
|
|
|