Skip to content

Commit 45d273a

Browse files
committed
Tests: Use buildDir as base for generated-resources (#30191)
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.
1 parent 62851cf commit 45d273a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

x-pack/qa/full-cluster-restart/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ subprojects {
114114
approvedLicenses << 'Apache'
115115
}
116116

117-
String outputDir = "generated-resources/${project.name}"
117+
String outputDir = "${buildDir}/generated-resources/${project.name}"
118118

119119
// This is a top level task which we will add dependencies to below.
120120
// It is a single task that can be used to backcompat tests against all versions.
@@ -123,7 +123,7 @@ subprojects {
123123
group = 'verification'
124124
}
125125

126-
String output = "generated-resources/${project.name}"
126+
String output = "${buildDir}/generated-resources/${project.name}"
127127
task copyTestNodeKeystore(type: Copy) {
128128
from project(xpackModule('core'))
129129
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')

x-pack/qa/rolling-upgrade/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ subprojects {
9292
}
9393
}
9494

95-
String outputDir = "generated-resources/${project.name}"
95+
String outputDir = "${buildDir}/generated-resources/${project.name}"
9696

9797
// This is a top level task which we will add dependencies to below.
9898
// It is a single task that can be used to backcompat tests against all versions.
@@ -101,7 +101,7 @@ subprojects {
101101
group = 'verification'
102102
}
103103

104-
String output = "generated-resources/${project.name}"
104+
String output = "${buildDir}/generated-resources/${project.name}"
105105
task copyTestNodeKeystore(type: Copy) {
106106
from project(xpackModule('core'))
107107
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')

x-pack/qa/security-client-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
77
}
88

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

x-pack/qa/smoke-test-plugins-ssl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
testCompile project(path: xpackModule('core'), configuration: 'runtime')
1818
}
1919

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

0 commit comments

Comments
 (0)