Skip to content

Commit 840fbda

Browse files
authored
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]>
1 parent 354f44a commit 840fbda

File tree

1 file changed

+7
-23
lines changed

1 file changed

+7
-23
lines changed

build.gradle

Lines changed: 7 additions & 23 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}"
@@ -292,8 +294,6 @@ Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
292294
integTest.dependsOn(bundle)
293295
integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
294296

295-
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"
296-
297297
testClusters.integTest {
298298
testDistribution = "INTEG_TEST"
299299
// need to install job-scheduler first, need to assemble job-scheduler first
@@ -303,15 +303,7 @@ testClusters.integTest {
303303
return new RegularFile() {
304304
@Override
305305
File getAsFile() {
306-
File dir = new File("src/test/resources/job-scheduler")
307-
if (!dir.exists()) {
308-
dir.mkdirs()
309-
}
310-
File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip")
311-
if (!file.exists()) {
312-
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
313-
}
314-
return fileTree("src/test/resources/job-scheduler").getSingleFile()
306+
return configurations.zipArchive.asFileTree.getSingleFile()
315307
}
316308
}
317309
}
@@ -333,12 +325,12 @@ testClusters.integTest {
333325
}
334326

335327
// For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0.
336-
String baseVersion = "2.6.0"
328+
String baseVersion = "2.7.0"
337329
String bwcVersion = baseVersion + ".0"
338330
String baseName = "reportsSchedulerBwcCluster"
339331
String bwcFilePath = "src/test/resources/bwc"
340-
String bwcJobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-${bwcVersion}.zip"
341-
String bwcReportsSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-reports-scheduler-${bwcVersion}.zip"
332+
String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-job-scheduler/2.7.0.0-SNAPSHOT/opensearch-job-scheduler-2.7.0.0-20230305.020625-11.zip"
333+
String bwcReportsSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-reports-scheduler/2.7.0.0-SNAPSHOT/opensearch-reports-scheduler-2.7.0.0-20230306.195720-1.zip"
342334

343335
2.times {i ->
344336
testClusters {
@@ -403,15 +395,7 @@ task prepareBwcTests {
403395
return new RegularFile() {
404396
@Override
405397
File getAsFile() {
406-
File dir = new File(bwcFilePath + "/job-scheduler/" + project.version)
407-
if (!dir.exists()) {
408-
dir.mkdirs()
409-
}
410-
File file = new File(dir, "opensearch-reports-scheduler-" + project.version + ".zip")
411-
if (!file.exists()) {
412-
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
413-
}
414-
return fileTree(bwcFilePath + "/job-scheduler/" + project.version).getSingleFile()
398+
return configurations.zipArchive.asFileTree.getSingleFile()
415399
}
416400
}
417401
}

0 commit comments

Comments
 (0)