diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index fbd098ee..41c552c9 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -240,6 +240,8 @@ Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin"); integTest.dependsOn(bundle) integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))} +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" + testClusters.integTest { testDistribution = "INTEG_TEST" // need to install job-scheduler first, need to assemble job-scheduler first @@ -249,6 +251,14 @@ testClusters.integTest { return new RegularFile() { @Override File getAsFile() { + File dir = new File("src/test/resources/job-scheduler") + if (!dir.exists()) { + dir.mkdirs() + } + File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip") + if (!file.exists()) { + new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} + } return fileTree("src/test/resources/job-scheduler").getSingleFile() } } @@ -274,6 +284,8 @@ testClusters.integTest { String bwcVersion = "1.13.0.0" String baseName = "reportsSchedulerBwcCluster" String bwcFilePath = "src/test/resources/bwc" +String bwcJobSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-job-scheduler/opendistro-job-scheduler-" + bwcVersion + ".zip" +String bwcReportsSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-reports-scheduler/opendistro-reports-scheduler-" + bwcVersion + ".zip" 2.times {i -> testClusters { @@ -287,6 +299,14 @@ String bwcFilePath = "src/test/resources/bwc" return new RegularFile() { @Override File getAsFile() { + File dir = new File(bwcFilePath + "/job-scheduler/" + bwcVersion) + if (!dir.exists()) { + dir.mkdirs() + } + File file = new File(dir, "opendistro-job-scheduler-" + bwcVersion + ".zip") + if (!file.exists()) { + new URL(bwcJobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} + } return fileTree(bwcFilePath + "/job-scheduler/" + bwcVersion).getSingleFile() } } @@ -298,6 +318,14 @@ String bwcFilePath = "src/test/resources/bwc" return new RegularFile() { @Override File getAsFile() { + File dir = new File(bwcFilePath + "/reports-scheduler/" + bwcVersion) + if (!dir.exists()) { + dir.mkdirs() + } + File file = new File(dir, "opendistro-reports-scheduler-" + bwcVersion + ".zip") + if (!file.exists()) { + new URL(bwcReportsSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} + } return fileTree(bwcFilePath + "/reports-scheduler/" + bwcVersion).getSingleFile() } } @@ -322,6 +350,14 @@ task prepareBwcTests { return new RegularFile() { @Override File getAsFile() { + File dir = new File(bwcFilePath + "/job-scheduler/" + project.version) + if (!dir.exists()) { + dir.mkdirs() + } + File file = new File(dir, "opendistro-reports-scheduler-" + project.version + ".zip") + if (!file.exists()) { + new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} + } return fileTree(bwcFilePath + "/job-scheduler/" + project.version).getSingleFile() } } diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/TestHelpers.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/TestHelpers.kt index f83a0b5b..e2a8fd20 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/TestHelpers.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/TestHelpers.kt @@ -93,4 +93,4 @@ internal fun createReportDefinitionDetails(): ReportDefinitionDetails { listOf(), reportDefinition = createReportDefinitionObject() ) -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionRequestTests.kt index 5a855f53..8fa6cec5 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionRequestTests.kt @@ -98,4 +98,4 @@ internal class CreateReportDefinitionRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { CreateReportDefinitionRequest(it) } Assertions.assertEquals(reportDefinitionObject, recreatedObject.reportDefinition) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionResponseTests.kt index a54c38a0..31629f02 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/CreateReportDefinitionResponseTests.kt @@ -68,4 +68,4 @@ internal class CreateReportDefinitionResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { CreateReportDefinitionResponse.parse(it) } Assertions.assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionRequestTests.kt index b178592c..83120dab 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionRequestTests.kt @@ -56,4 +56,4 @@ internal class DeleteReportDefinitionRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { DeleteReportDefinitionRequest.parse(it) } assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionResponseTests.kt index 264163e8..7ea878b8 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/DeleteReportDefinitionResponseTests.kt @@ -64,4 +64,4 @@ internal class DeleteReportDefinitionResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { DeleteReportDefinitionResponse.parse(it) } assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsRequestTests.kt index 4794ca33..e1cc541b 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsRequestTests.kt @@ -69,4 +69,4 @@ internal class GetAllReportDefinitionsRequestTests { assertEquals(0, recreatedObject.fromIndex) assertEquals(defaultMaxItems, recreatedObject.maxItems) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsResponseTests.kt index 6dd4d12a..7644d54f 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportDefinitionsResponseTests.kt @@ -132,4 +132,4 @@ internal class GetAllReportDefinitionsResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetAllReportDefinitionsResponse(it) } Assertions.assertEquals(reportDefinitionDetailsSearchResults.objectList, recreatedObject.reportDefinitionList.objectList) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesRequestTests.kt index 2928b719..db9f7384 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesRequestTests.kt @@ -68,4 +68,4 @@ internal class GetAllReportInstancesRequestTests { assertEquals(0, recreatedObject.fromIndex) assertEquals(defaultMaxItems, recreatedObject.maxItems) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesResponseTests.kt index e39dae99..747b7d56 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetAllReportInstancesResponseTests.kt @@ -103,4 +103,4 @@ internal class GetAllReportInstancesResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetAllReportInstancesResponse(it) } Assertions.assertEquals(reportInstanceSearchResults.objectList, recreatedObject.reportInstanceList.objectList) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionRequestTests.kt index 037bc2cf..0f9ef233 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionRequestTests.kt @@ -67,4 +67,4 @@ internal class GetReportDefinitionRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetReportDefinitionRequest.parse(it) } assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionResponseTests.kt index fbc8ddbe..a47a6137 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportDefinitionResponseTests.kt @@ -111,4 +111,4 @@ internal class GetReportDefinitionResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetReportDefinitionResponse(it) } assertEquals(reportDefinitionDetails, recreatedObject.reportDefinitionDetails) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceRequestTests.kt index 12e34ef0..ee4c5457 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceRequestTests.kt @@ -67,4 +67,4 @@ internal class GetReportInstanceRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetReportInstanceRequest.parse(it) } Assertions.assertEquals(reportInstanceId, recreatedObject.reportInstanceId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceResponseTests.kt index ec1b7fc1..5f49049e 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/GetReportInstanceResponseTests.kt @@ -84,4 +84,4 @@ internal class GetReportInstanceResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { GetReportInstanceResponse(it) } Assertions.assertEquals(reportInstance, recreatedObject.reportInstance) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateRequestTests.kt index e08e61d4..5991dc1b 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateRequestTests.kt @@ -80,4 +80,4 @@ internal class InContextReportCreateRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { InContextReportCreateRequest(it) } verify(request, recreatedObject) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateResponseTests.kt index aabba22a..8207aee6 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/InContextReportCreateResponseTests.kt @@ -84,4 +84,4 @@ internal class InContextReportCreateResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { InContextReportCreateResponse(it) } Assertions.assertEquals(reportInstance, recreatedObject.reportInstance) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateRequestTests.kt index 29370c64..83726340 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateRequestTests.kt @@ -56,4 +56,4 @@ internal class OnDemandReportCreateRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { OnDemandReportCreateRequest.parse(it) } Assertions.assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateResponseTests.kt index b07fccac..b6977f8b 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/OnDemandReportCreateResponseTests.kt @@ -83,4 +83,4 @@ internal class OnDemandReportCreateResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { OnDemandReportCreateResponse(it) } Assertions.assertEquals(reportInstance, recreatedObject.reportInstance) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionRequestTests.kt index e66ae88e..d967591c 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionRequestTests.kt @@ -100,4 +100,4 @@ internal class UpdateReportDefinitionRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { UpdateReportDefinitionRequest(it) } Assertions.assertEquals(reportDefinitionRequest.reportDefinition, recreatedObject.reportDefinition) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionResponseTests.kt index 8b68d5fd..aad1cce2 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportDefinitionResponseTests.kt @@ -66,4 +66,4 @@ internal class UpdateReportDefinitionResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { UpdateReportDefinitionResponse.parse(it) } Assertions.assertEquals(reportDefinitionId, recreatedObject.reportDefinitionId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusRequestTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusRequestTests.kt index ec8bd370..4257d9c0 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusRequestTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusRequestTests.kt @@ -68,4 +68,4 @@ internal class UpdateReportInstanceStatusRequestTests { val recreatedObject = createObjectFromJsonString(jsonString) { UpdateReportInstanceStatusRequest.parse(it) } verify(request, recreatedObject) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusResponseTests.kt b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusResponseTests.kt index dcdb7b3c..cf5c140e 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusResponseTests.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/reportsscheduler/model/UpdateReportInstanceStatusResponseTests.kt @@ -67,4 +67,4 @@ internal class UpdateReportInstanceStatusResponseTests { val recreatedObject = createObjectFromJsonString(jsonString) { UpdateReportInstanceStatusResponse.parse(it) } Assertions.assertEquals(reportInstanceId, recreatedObject.reportInstanceId) } -} \ No newline at end of file +} diff --git a/reports-scheduler/src/test/resources/bwc/job-scheduler/.gitignore b/reports-scheduler/src/test/resources/bwc/job-scheduler/.gitignore new file mode 100644 index 00000000..99f6ad50 --- /dev/null +++ b/reports-scheduler/src/test/resources/bwc/job-scheduler/.gitignore @@ -0,0 +1,4 @@ +# ignore artifacts in this directory +* +*/ +!.gitignore diff --git a/reports-scheduler/src/test/resources/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip b/reports-scheduler/src/test/resources/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip deleted file mode 100644 index daf3b8f7..00000000 Binary files a/reports-scheduler/src/test/resources/bwc/job-scheduler/1.13.0.0/opendistro-job-scheduler-1.13.0.0.zip and /dev/null differ diff --git a/reports-scheduler/src/test/resources/bwc/reports-scheduler/.gitignore b/reports-scheduler/src/test/resources/bwc/reports-scheduler/.gitignore new file mode 100644 index 00000000..99f6ad50 --- /dev/null +++ b/reports-scheduler/src/test/resources/bwc/reports-scheduler/.gitignore @@ -0,0 +1,4 @@ +# ignore artifacts in this directory +* +*/ +!.gitignore diff --git a/reports-scheduler/src/test/resources/bwc/reports-scheduler/1.13.0.0/opendistro-reports-scheduler-1.13.0.0.zip b/reports-scheduler/src/test/resources/bwc/reports-scheduler/1.13.0.0/opendistro-reports-scheduler-1.13.0.0.zip deleted file mode 100644 index 79abef18..00000000 Binary files a/reports-scheduler/src/test/resources/bwc/reports-scheduler/1.13.0.0/opendistro-reports-scheduler-1.13.0.0.zip and /dev/null differ diff --git a/reports-scheduler/src/test/resources/job-scheduler/.gitignore b/reports-scheduler/src/test/resources/job-scheduler/.gitignore new file mode 100644 index 00000000..99f6ad50 --- /dev/null +++ b/reports-scheduler/src/test/resources/job-scheduler/.gitignore @@ -0,0 +1,4 @@ +# ignore artifacts in this directory +* +*/ +!.gitignore