Skip to content

Commit

Permalink
Tests: Use buildDir as base for generated-resources (#30191)
Browse files Browse the repository at this point in the history
This commit moves the generated-resources directory created by many qa
projects into the build directory, so it is not seen as unknown files to
git.
  • Loading branch information
rjernst committed Apr 26, 2018
1 parent 62851cf commit 45d273a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions x-pack/qa/full-cluster-restart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ subprojects {
approvedLicenses << 'Apache'
}

String outputDir = "generated-resources/${project.name}"
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.
Expand All @@ -123,7 +123,7 @@ subprojects {
group = 'verification'
}

String output = "generated-resources/${project.name}"
String output = "${buildDir}/generated-resources/${project.name}"
task copyTestNodeKeystore(type: Copy) {
from project(xpackModule('core'))
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
Expand Down
4 changes: 2 additions & 2 deletions x-pack/qa/rolling-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ subprojects {
}
}

String outputDir = "generated-resources/${project.name}"
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.
Expand All @@ -101,7 +101,7 @@ subprojects {
group = 'verification'
}

String output = "generated-resources/${project.name}"
String output = "${buildDir}/generated-resources/${project.name}"
task copyTestNodeKeystore(type: Copy) {
from project(xpackModule('core'))
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/security-client-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
}

String outputDir = "generated-resources/${project.name}"
String outputDir = "${buildDir}/generated-resources/${project.name}"
task copyXPackPluginProps(type: Copy) {
from project(xpackModule('core')).file('src/main/plugin-metadata')
from project(xpackModule('core')).tasks.pluginProperties
Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/smoke-test-plugins-ssl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
testCompile project(path: xpackModule('core'), configuration: 'runtime')
}

String outputDir = "generated-resources/${project.name}"
String outputDir = "${buildDir}/generated-resources/${project.name}"
task copyXPackPluginProps(type: Copy) {
from project(xpackModule('core')).file('src/main/plugin-metadata')
from project(xpackModule('core')).tasks.pluginProperties
Expand Down

0 comments on commit 45d273a

Please sign in to comment.