Skip to content

Commit 55e1b1e

Browse files
authored
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 80e0e64 commit 55e1b1e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
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-basic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ task bwcTest {
7171
group = 'verification'
7272
}
7373

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

7676
for (Version version : bwcVersions.wireCompatible) {
7777
String baseName = "v${version}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ subprojects {
9696
}
9797
}
9898

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

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

108-
String output = "generated-resources/${project.name}"
108+
String output = "${buildDir}/generated-resources/${project.name}"
109109
task copyTestNodeKeystore(type: Copy) {
110110
from project(xpackModule('core'))
111111
.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)