mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-09 14:34:43 +00:00
8d311297ca
* Smarter copying of the rest specs and tests (#52114) This PR addresses the unnecessary copying of the rest specs and allows for better semantics for which specs and tests are copied. By default the rest specs will get copied if the project applies `elasticsearch.standalone-rest-test` or `esplugin` and the project has rest tests or you configure the custom extension `restResources`. This PR also removes the need for dozens of places where the x-pack specs were copied by supporting copying of the x-pack rest specs too. The plugin/task introduced here can also copy the rest tests to the local project through a similar configuration. The new plugin/task allows a user to minimize the surface area of which rest specs are copied. Per project can be configured to include only a subset of the specs (or tests). Configuring a project to only copy the specs when actually needed should help with build cache hit rates since we can better define what is actually in use. However, project level optimizations for build cache hit rates are not included with this PR. Also, with this PR you can no longer use the includePackaged flag on integTest task. The following items are included in this PR: * new plugin: `elasticsearch.rest-resources` * new tasks: CopyRestApiTask and CopyRestTestsTask - performs the copy * new extension 'restResources' ``` restResources { restApi { includeCore 'foo' , 'bar' //will include the core specs that start with foo and bar includeXpack 'baz' //will include x-pack specs that start with baz } restTests { includeCore 'foo', 'bar' //will include the core tests that start with foo and bar includeXpack 'baz' //will include the x-pack tests that start with baz } } ```
95 lines
3.6 KiB
Groovy
95 lines
3.6 KiB
Groovy
import groovy.json.JsonSlurper
|
|
|
|
import javax.net.ssl.HttpsURLConnection
|
|
import java.nio.charset.StandardCharsets
|
|
|
|
apply plugin: 'elasticsearch.testclusters'
|
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
|
apply plugin: 'elasticsearch.rest-test'
|
|
|
|
dependencies {
|
|
testCompile project(':x-pack:plugin:core')
|
|
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
|
|
}
|
|
|
|
restResources {
|
|
restApi {
|
|
includeXpack 'watcher'
|
|
}
|
|
}
|
|
|
|
String jiraUrl = System.getenv('jira_url')
|
|
String jiraUser = System.getenv('jira_user')
|
|
String jiraPassword = System.getenv('jira_password')
|
|
String jiraProject = System.getenv('jira_project')
|
|
|
|
task cleanJira(type: DefaultTask) {
|
|
doLast {
|
|
List<String> issues = jiraIssues(jiraProject)
|
|
assert issues instanceof List
|
|
issues.forEach {
|
|
// See https://docs.atlassian.com/jira/REST/cloud/#api/2/issue-deleteIssue
|
|
logger.debug("Deleting JIRA issue [${it}]")
|
|
jiraHttpRequest("issue/${it}", "DELETE", 204)
|
|
}
|
|
}
|
|
}
|
|
|
|
// require network access for this one, exit early instead of starting up the cluster if we dont have network
|
|
if (!jiraUrl && !jiraUser && !jiraPassword && !jiraProject) {
|
|
integTest.enabled = false
|
|
testingConventions.enabled = false
|
|
} else {
|
|
testClusters.integTest {
|
|
testDistribution = 'DEFAULT'
|
|
setting 'xpack.security.enabled', 'false'
|
|
setting 'xpack.monitoring.enabled', 'false'
|
|
setting 'xpack.ml.enabled', 'false'
|
|
setting 'xpack.license.self_generated.type', 'trial'
|
|
setting 'logger.org.elasticsearch.xpack.watcher', 'DEBUG'
|
|
setting 'xpack.notification.jira.account.test.issue_defaults.issuetype.name', 'Bug'
|
|
setting 'xpack.notification.jira.account.test.issue_defaults.labels.0', 'integration-tests'
|
|
setting 'xpack.notification.jira.account.test.issue_defaults.project.key', jiraProject
|
|
keystore 'xpack.notification.jira.account.test.secure_url', jiraUrl
|
|
keystore 'xpack.notification.jira.account.test.secure_user', jiraUser
|
|
keystore 'xpack.notification.jira.account.test.secure_password', jiraPassword
|
|
}
|
|
integTest.runner.finalizedBy cleanJira
|
|
}
|
|
|
|
/** List all issues associated to a given Jira project **/
|
|
def jiraIssues(projectKey) {
|
|
// See https://docs.atlassian.com/jira/REST/cloud/#api/2/search-search
|
|
def response = jiraHttpRequest("search?maxResults=100&fields=id,self,key&jql=project%3D${projectKey}", "GET", 200)
|
|
assert response.issues instanceof List
|
|
return response.issues.findAll { it.key.startsWith(projectKey) }.collect { it.key }
|
|
}
|
|
|
|
/** Execute an HTTP request against the Jira server instance **/
|
|
def jiraHttpRequest(String endpoint, String method, int successCode) {
|
|
HttpsURLConnection connection = null;
|
|
try {
|
|
byte[] credentials = "${jiraUser}:${jiraPassword}".getBytes(StandardCharsets.UTF_8);
|
|
connection = (HttpsURLConnection) new URL("${jiraUrl}/rest/api/2/${endpoint}").openConnection();
|
|
connection.setRequestProperty("Authorization", "Basic " + Base64.getEncoder().encodeToString(credentials));
|
|
connection.setRequestMethod(method);
|
|
connection.connect();
|
|
|
|
if (connection.getResponseCode() == successCode) {
|
|
String response = connection.getInputStream().getText(StandardCharsets.UTF_8.name());
|
|
if (response != null && response.length() > 0) {
|
|
return new JsonSlurper().parseText(response)
|
|
}
|
|
} else {
|
|
throw new GradleException("Unexpected response code for [${endpoint}]: got ${connection.getResponseCode()} but expected ${successCode}")
|
|
}
|
|
} catch (Exception e) {
|
|
logger.error("Failed to delete JIRA issues after test execution", e)
|
|
} finally {
|
|
if (connection != null) {
|
|
connection.disconnect();
|
|
}
|
|
}
|
|
return null
|
|
}
|