mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-06 04:58:50 +00:00
08b8d11e30
* remove left-over comment
* make sure of the property for plugins
* skip installing modules if these exist in the distribution
* Log the distrbution being ran
* Don't allow running with integ-tests-zip passed externally
* top level x-pack/qa can't run with oss distro
* Add support for matching objects in lists
Makes it possible to have a key that points to a list and assert that a
certain object is present in the list. All keys have to be present and
values have to match. The objects in the source list may have additional
fields.
example:
```
match: { 'nodes.$master.plugins': { name: ingest-attachment } }
```
* Update plugin and module tests to work with other distributions
Some of the tests expected that the integration tests will always be ran
with the `integ-test-zip` distribution so that there will be no other
plugins loaded.
With this change, we check for the presence of the plugin without
assuming exclusivity.
* Allow modules to run on other distros as well
To match the behavior of tets.distributions
* Add and use a new `contains` assertion
Replaces the previus changes that caused `match` to do a partial match.
* Implement PR review comments
62 lines
2.4 KiB
Groovy
62 lines
2.4 KiB
Groovy
/*
|
|
* 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.ClusterConfiguration
|
|
import org.elasticsearch.gradle.test.ClusterFormationTasks
|
|
import org.elasticsearch.gradle.test.NodeInfo
|
|
|
|
esplugin {
|
|
description 'Discovery file plugin enables unicast discovery from hosts stored in a file.'
|
|
classname 'org.elasticsearch.discovery.file.FileBasedDiscoveryPlugin'
|
|
}
|
|
|
|
bundlePlugin {
|
|
from('config/discovery-file') {
|
|
into 'config'
|
|
}
|
|
}
|
|
|
|
task setupSeedNodeAndUnicastHostsFile(type: DefaultTask) {
|
|
mustRunAfter(precommit)
|
|
}
|
|
// setup the initial cluster with one node that will serve as the seed node
|
|
// for unicast discovery
|
|
ClusterConfiguration config = new ClusterConfiguration(project)
|
|
config.distribution = System.getProperty('tests.distribution', 'integ-test-zip')
|
|
config.clusterName = 'discovery-file-test-cluster'
|
|
List<NodeInfo> nodes = ClusterFormationTasks.setup(project, 'initialCluster', setupSeedNodeAndUnicastHostsFile, config)
|
|
File srcUnicastHostsFile = file('build/cluster/unicast_hosts.txt')
|
|
|
|
// write the unicast_hosts.txt file to a temporary location to be used by the second cluster
|
|
setupSeedNodeAndUnicastHostsFile.doLast {
|
|
// write the unicast_hosts.txt file to a temp file in the build directory
|
|
srcUnicastHostsFile.setText(nodes.get(0).transportUri(), 'UTF-8')
|
|
}
|
|
|
|
// second cluster, which will connect to the first via the unicast_hosts.txt file
|
|
integTestCluster {
|
|
dependsOn setupSeedNodeAndUnicastHostsFile
|
|
clusterName = 'discovery-file-test-cluster'
|
|
setting 'discovery.zen.hosts_provider', 'file'
|
|
extraConfigFile 'discovery-file/unicast_hosts.txt', srcUnicastHostsFile
|
|
}
|
|
|
|
integTestRunner.finalizedBy ':plugins:discovery-file:initialCluster#stop'
|
|
|