mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-13 16:35:45 +00:00
The vagrant based tests currently reside in a single project, creating dozens of tasks to manage starting and stopping the vagrant VM along with running java and bats tests within each image. This all-in-one pattern makes parallelizing packaging tests difficult. This commit rewrites the vagrant testing infrastructure to be independent of the actual test runners, thus allowing each platform to be handled in a separate subproject. Additionally, the java and bats tests are changed to be run through a "destructive" gradle task, which is run inside the VM. The combination of these will allow parallelization both locally (through running several VMs at once) as well as running the destructive tasks in CI machines dedicated to each platform (thus removing the need for vagrant in CI).
129 lines
4.3 KiB
Groovy
129 lines
4.3 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.
|
|
*/
|
|
|
|
plugins {
|
|
id 'elasticsearch.build'
|
|
}
|
|
|
|
dependencies {
|
|
compile "junit:junit:${versions.junit}"
|
|
compile "org.hamcrest:hamcrest:${versions.hamcrest}"
|
|
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
|
|
|
|
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
|
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
|
compile "org.apache.httpcomponents:fluent-hc:${versions.httpclient}"
|
|
compile "commons-codec:commons-codec:${versions.commonscodec}"
|
|
compile "commons-logging:commons-logging:${versions.commonslogging}"
|
|
|
|
compile project(':libs:elasticsearch-core')
|
|
}
|
|
|
|
configurations.create('testClasses')
|
|
|
|
String classesDir = project.file(project.sourceSets.main.output.classesDirs.singleFile).toString()
|
|
artifacts.add('testClasses', project.layout.projectDirectory.dir(classesDir)) {
|
|
builtBy tasks.named('testClasses')
|
|
}
|
|
|
|
forbiddenApisMain {
|
|
replaceSignatureFiles 'jdk-signatures'
|
|
}
|
|
|
|
// we don't have additional tests for the tests themselves
|
|
tasks.test.enabled = false
|
|
// Tests are destructive and meant to run in a VM, they don't adhere to general conventions
|
|
testingConventions.enabled = false
|
|
|
|
// this project doesn't get published
|
|
tasks.dependencyLicenses.enabled = false
|
|
tasks.dependenciesInfo.enabled = false
|
|
|
|
tasks.thirdPartyAudit.ignoreMissingClasses (
|
|
// commons-logging optional dependencies
|
|
'org.apache.avalon.framework.logger.Logger',
|
|
'org.apache.log.Hierarchy',
|
|
'org.apache.log.Logger',
|
|
'org.apache.log4j.Category',
|
|
'org.apache.log4j.Level',
|
|
'org.apache.log4j.Logger',
|
|
'org.apache.log4j.Priority',
|
|
// commons-logging provided dependencies
|
|
'javax.servlet.ServletContextEvent',
|
|
'javax.servlet.ServletContextListener'
|
|
)
|
|
|
|
boolean sample = project.properties.get('vagrant.boxes') != 'all'
|
|
|
|
subprojects { Project platformProject ->
|
|
apply plugin: 'elasticsearch.distro-test'
|
|
apply plugin: 'java'
|
|
|
|
configurations.create('testClasses')
|
|
dependencies {
|
|
testClasses project(path: ':qa:vagrant', configuration: 'testClasses')
|
|
testRuntime project(path: ':qa:vagrant', configuration: 'runtime')
|
|
}
|
|
|
|
tasks.named('destructiveDistroTest') {
|
|
testClassesDirs += project.files(configurations.testClasses.singleFile)
|
|
}
|
|
|
|
// TODO: remove this property lookup once CI is switched to use an explicit task for the sample tests
|
|
boolean allBoxes = project.properties.get('vagrant.boxes', '') == 'all'
|
|
if (allBoxes || ['centos-7', 'ubuntu-1604'].contains(platformProject.name)) {
|
|
tasks.register('packagingTest') {
|
|
dependsOn 'distroTest', 'batsTest.oss', 'batsTest.default'
|
|
}
|
|
}
|
|
|
|
vagrant {
|
|
hostEnv 'VAGRANT_PROJECT_DIR', platformProject.projectDir.absolutePath
|
|
}
|
|
|
|
}
|
|
|
|
configurations {
|
|
allPlugins
|
|
}
|
|
|
|
List<String> plugins = []
|
|
for (Project subproj : project.rootProject.subprojects) {
|
|
if (subproj.parent.path == ':plugins' || subproj.path.equals(':example-plugins:custom-settings')) {
|
|
// add plugin as a dep
|
|
dependencies {
|
|
allPlugins project(path: "${subproj.path}", configuration: 'zip')
|
|
}
|
|
plugins.add(subproj.name)
|
|
}
|
|
}
|
|
plugins = plugins.toSorted()
|
|
|
|
copyPackagingArchives {
|
|
from configurations.allPlugins
|
|
doLast {
|
|
// TODO: this was copied from the old way bats tests get the plugins list. we should pass
|
|
// this in differently when converting to java tests
|
|
File expectedPlugins = file('build/plugins/expected')
|
|
expectedPlugins.parentFile.mkdirs()
|
|
expectedPlugins.setText(plugins.join('\n'), 'UTF-8')
|
|
}
|
|
}
|
|
|