Skip to content

Commit 7d5556c

Browse files
committed
Remove zips and download from remote at build time (opensearch-project#337)
Signed-off-by: Joshua Li <[email protected]>
1 parent 072ac50 commit 7d5556c

27 files changed

+69
-21
lines changed

reports-scheduler/build.gradle

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
240240
integTest.dependsOn(bundle)
241241
integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
242242

243+
String jobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + opensearch_version.replace("-SNAPSHOT", "") + "/latest/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-" + opensearch_build.replace("-SNAPSHOT", "") + ".zip"
244+
243245
testClusters.integTest {
244246
testDistribution = "INTEG_TEST"
245247
// need to install job-scheduler first, need to assemble job-scheduler first
@@ -249,6 +251,14 @@ testClusters.integTest {
249251
return new RegularFile() {
250252
@Override
251253
File getAsFile() {
254+
File dir = new File("src/test/resources/job-scheduler")
255+
if (!dir.exists()) {
256+
dir.mkdirs()
257+
}
258+
File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip")
259+
if (!file.exists()) {
260+
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
261+
}
252262
return fileTree("src/test/resources/job-scheduler").getSingleFile()
253263
}
254264
}
@@ -274,6 +284,8 @@ testClusters.integTest {
274284
String bwcVersion = "1.13.0.0"
275285
String baseName = "reportsSchedulerBwcCluster"
276286
String bwcFilePath = "src/test/resources/bwc"
287+
String bwcJobSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-job-scheduler/opendistro-job-scheduler-" + bwcVersion + ".zip"
288+
String bwcReportsSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-reports-scheduler/opendistro-reports-scheduler-" + bwcVersion + ".zip"
277289

278290
2.times {i ->
279291
testClusters {
@@ -287,6 +299,14 @@ String bwcFilePath = "src/test/resources/bwc"
287299
return new RegularFile() {
288300
@Override
289301
File getAsFile() {
302+
File dir = new File(bwcFilePath + "/job-scheduler/" + bwcVersion)
303+
if (!dir.exists()) {
304+
dir.mkdirs()
305+
}
306+
File file = new File(dir, "opendistro-job-scheduler-" + bwcVersion + ".zip")
307+
if (!file.exists()) {
308+
new URL(bwcJobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
309+
}
290310
return fileTree(bwcFilePath + "/job-scheduler/" + bwcVersion).getSingleFile()
291311
}
292312
}
@@ -298,6 +318,14 @@ String bwcFilePath = "src/test/resources/bwc"
298318
return new RegularFile() {
299319
@Override
300320
File getAsFile() {
321+
File dir = new File(bwcFilePath + "/reports-scheduler/" + bwcVersion)
322+
if (!dir.exists()) {
323+
dir.mkdirs()
324+
}
325+
File file = new File(dir, "opendistro-reports-scheduler-" + bwcVersion + ".zip")
326+
if (!file.exists()) {
327+
new URL(bwcReportsSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
328+
}
301329
return fileTree(bwcFilePath + "/reports-scheduler/" + bwcVersion).getSingleFile()
302330
}
303331
}
@@ -322,6 +350,14 @@ task prepareBwcTests {
322350
return new RegularFile() {
323351
@Override
324352
File getAsFile() {
353+
File dir = new File(bwcFilePath + "/job-scheduler/" + project.version)
354+
if (!dir.exists()) {
355+
dir.mkdirs()
356+
}
357+
File file = new File(dir, "opendistro-reports-scheduler-" + project.version + ".zip")
358+
if (!file.exists()) {
359+
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
360+
}
325361
return fileTree(bwcFilePath + "/job-scheduler/" + project.version).getSingleFile()
326362
}
327363
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/TestHelpers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ internal fun createReportDefinitionDetails(): ReportDefinitionDetails {
9393
listOf(),
9494
reportDefinition = createReportDefinitionObject()
9595
)
96-
}
96+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionRequestTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ internal class CreateReportDefinitionRequestTests {
9898
val recreatedObject = createObjectFromJsonString(jsonString) { CreateReportDefinitionRequest(it) }
9999
Assertions.assertEquals(reportDefinitionObject, recreatedObject.reportDefinition)
100100
}
101-
}
101+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionResponseTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ internal class CreateReportDefinitionResponseTests {
6868
val recreatedObject = createObjectFromJsonString(jsonString) { CreateReportDefinitionResponse.parse(it) }
6969
Assertions.assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId)
7070
}
71-
}
71+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionRequestTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ internal class DeleteReportDefinitionRequestTests {
5656
val recreatedObject = createObjectFromJsonString(jsonString) { DeleteReportDefinitionRequest.parse(it) }
5757
assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId)
5858
}
59-
}
59+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionResponseTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ internal class DeleteReportDefinitionResponseTests {
6464
val recreatedObject = createObjectFromJsonString(jsonString) { DeleteReportDefinitionResponse.parse(it) }
6565
assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId)
6666
}
67-
}
67+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsRequestTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ internal class GetAllReportDefinitionsRequestTests {
6969
assertEquals(0, recreatedObject.fromIndex)
7070
assertEquals(defaultMaxItems, recreatedObject.maxItems)
7171
}
72-
}
72+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsResponseTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@ internal class GetAllReportDefinitionsResponseTests {
132132
val recreatedObject = createObjectFromJsonString(jsonString) { GetAllReportDefinitionsResponse(it) }
133133
Assertions.assertEquals(reportDefinitionDetailsSearchResults.objectList, recreatedObject.reportDefinitionList.objectList)
134134
}
135-
}
135+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesRequestTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ internal class GetAllReportInstancesRequestTests {
6868
assertEquals(0, recreatedObject.fromIndex)
6969
assertEquals(defaultMaxItems, recreatedObject.maxItems)
7070
}
71-
}
71+
}

reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesResponseTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ internal class GetAllReportInstancesResponseTests {
103103
val recreatedObject = createObjectFromJsonString(jsonString) { GetAllReportInstancesResponse(it) }
104104
Assertions.assertEquals(reportInstanceSearchResults.objectList, recreatedObject.reportInstanceList.objectList)
105105
}
106-
}
106+
}

0 commit comments

Comments
 (0)