Skip to content

Commit 70a76b2

Browse files
authored
removing job-scheduler zip and replacing with distribution build (opensearch-project#487)
* removing job-scheduler zip and replacign with distribution build Signed-off-by: Amit Galitzky <[email protected]> * added constants Signed-off-by: Amit Galitzky <[email protected]>
1 parent 80beb7c commit 70a76b2

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ out/
1414
.classpath
1515
.vscode
1616
bin/
17-
._.DS_Store
17+
._.DS_Store
18+
src/test/resources/job-scheduler/

build.gradle

+15-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ buildscript {
2222
// 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT
2323
version_tokens = opensearch_version.tokenize('-')
2424
opensearch_build = version_tokens[0] + '.0'
25+
job_scheduler_no_snapshot = opensearch_build
2526
if (buildVersionQualifier) {
2627
opensearch_build += "-${buildVersionQualifier}"
28+
job_scheduler_no_snapshot += "-${buildVersionQualifier}"
2729
}
2830
if (isSnapshot) {
2931
opensearch_build += "-SNAPSHOT"
3032
}
33+
opensearch_no_snapshot = opensearch_version.replace("-SNAPSHOT","")
34+
js_resource_folder = "src/test/resources/job-scheduler"
3135
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
3236
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
37+
job_scheduler_build_download = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot +
38+
'/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-' + job_scheduler_no_snapshot + '.zip'
3339
}
3440

3541
repositories {
@@ -254,7 +260,11 @@ testClusters.integTest {
254260
return new RegularFile() {
255261
@Override
256262
File getAsFile() {
257-
return fileTree("src/test/resources/job-scheduler").getSingleFile()
263+
project.mkdir js_resource_folder
264+
ant.get(src: job_scheduler_build_download,
265+
dest: js_resource_folder,
266+
httpusecaches: false)
267+
return fileTree(js_resource_folder).getSingleFile()
258268
}
259269
}
260270
}
@@ -326,7 +336,10 @@ String bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/"
326336
return new RegularFile() {
327337
@Override
328338
File getAsFile() {
329-
return fileTree(bwcFilePath + "job-scheduler/" + bwcVersion).getSingleFile()
339+
ant.get(src: job_scheduler_build_download,
340+
dest: bwcFilePath + "job-scheduler/" + opensearch_version,
341+
httpusecaches: false)
342+
return fileTree(bwcFilePath + "job-scheduler/" + opensearch_version).getSingleFile()
330343
}
331344
}
332345
}
Binary file not shown.

0 commit comments

Comments
 (0)