Skip to content

Commit eec04df

Browse files
derek-horupal-bq
authored andcommitted
Pull Job scheduler from maven instead of jenkins (#663)
* use maven Signed-off-by: Derek Ho <[email protected]> * bwc version to 2.7.0 bump Signed-off-by: Derek Ho <[email protected]> * hard code zips Signed-off-by: Derek Ho <[email protected]> --------- Signed-off-by: Derek Ho <[email protected]> Signed-off-by: Rupal Mahajan <[email protected]>
1 parent 6c56603 commit eec04df

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

build.gradle

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ configurations {
116116
ktlint
117117
testCompile
118118
testRuntime
119+
zipArchive
119120
}
120121

121122
detekt {
@@ -167,6 +168,7 @@ repositories {
167168
}
168169

169170
dependencies {
171+
zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
170172
implementation "org.opensearch:opensearch:${opensearch_version}"
171173
implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
172174
implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
@@ -293,8 +295,6 @@ Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
293295
integTest.dependsOn(bundle)
294296
integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
295297

296-
String jobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + opensearch_version.replace("-SNAPSHOT", "") + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-" + opensearch_build.replace("-SNAPSHOT", "") + ".zip"
297-
298298
testClusters.integTest {
299299
testDistribution = "INTEG_TEST"
300300
// need to install job-scheduler first, need to assemble job-scheduler first
@@ -304,15 +304,7 @@ testClusters.integTest {
304304
return new RegularFile() {
305305
@Override
306306
File getAsFile() {
307-
File dir = new File("src/test/resources/job-scheduler")
308-
if (!dir.exists()) {
309-
dir.mkdirs()
310-
}
311-
File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip")
312-
if (!file.exists()) {
313-
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
314-
}
315-
return fileTree("src/test/resources/job-scheduler").getSingleFile()
307+
return configurations.zipArchive.asFileTree.getSingleFile()
316308
}
317309
}
318310
}

0 commit comments

Comments
 (0)