Skip to content

Commit 25b17ae

Browse files
committed
Adapt searchable snapshot to latest master changes
1 parent 054111d commit 25b17ae

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
import org.elasticsearch.gradle.test.RestIntegTestTask
2-
31
apply plugin: 'elasticsearch.build'
42
test.enabled = false
53

64
dependencies {
75
compile project(':test:framework')
86
}
9-
10-
subprojects {
11-
project.tasks.withType(RestIntegTestTask) {
12-
final File xPackResources = new File(xpackProject('plugin:searchable-snapshots').projectDir, 'src/test/resources')
13-
project.copyRestSpec.from(xPackResources) {
14-
include 'rest-api-spec/api/**'
15-
}
16-
}
17-
}

x-pack/plugin/searchable-snapshots/qa/rest/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,10 @@ testClusters.integTest {
1616
testDistribution = 'DEFAULT'
1717
setting 'path.repo', repoDir.absolutePath
1818
}
19+
20+
restResources {
21+
restApi {
22+
includeCore 'indices', 'bulk', 'snapshot', 'nodes'
23+
includeXpack 'searchable_snapshots'
24+
}
25+
}

x-pack/plugin/searchable-snapshots/qa/s3/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ dependencies {
1111
testCompile repositoryPlugin
1212
}
1313

14+
restResources {
15+
restApi {
16+
includeCore 'indices', 'bulk', 'snapshot', 'nodes'
17+
includeXpack 'searchable_snapshots'
18+
}
19+
}
20+
1421
boolean useFixture = false
1522
String s3AccessKey = System.getenv("amazon_s3_access_key")
1623
String s3SecretKey = System.getenv("amazon_s3_secret_key")

0 commit comments

Comments
 (0)