From 041f3afea8571345b39404740678261f2d672e23 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 16 Aug 2022 14:10:15 -0700 Subject: [PATCH] Add Bwc Test for OS 1.1 (#417) Signed-off-by: Shenoy Pratik --- ...reports-scheduler-test-and-build-workflow.yml | 1 - reports-scheduler/build.gradle | 16 ++++++++-------- .../ReportsSchedulerBackwardsCompatibilityIT.kt | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index 2e78ad08..8f0c0377 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -27,7 +27,6 @@ jobs: echo "Running backwards compatibility tests ..." ./gradlew bwcTestSuite - - name: Build with Gradle run: | cd reports-scheduler diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index b3230722..779ce418 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -315,18 +315,18 @@ testClusters.integTest { setting 'path.repo', repo.absolutePath } -// For job-scheduler and reports-scheduler, the latest opendistro releases appear to be 1.13.0.0. -String bwcVersion = "1.13.0.0" +// For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0. +String bwcVersion = "1.1.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" +String bwcJobSchedulerURL = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-1.1.0.0.zip" +String bwcReportsSchedulerURL = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-reports-scheduler-1.1.0.0.zip" 2.times {i -> testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["7.10.2", opensearch_version] + versions = ["1.1.0", opensearch_version] numberOfNodes = 3 plugin(provider(new Callable(){ @Override @@ -338,7 +338,7 @@ String bwcReportsSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads if (!dir.exists()) { dir.mkdirs() } - File file = new File(dir, "opendistro-job-scheduler-" + bwcVersion + ".zip") + File file = new File(dir, "opensearch-job-scheduler-" + bwcVersion + ".zip") if (!file.exists()) { new URL(bwcJobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} } @@ -357,7 +357,7 @@ String bwcReportsSchedulerURL = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads if (!dir.exists()) { dir.mkdirs() } - File file = new File(dir, "opendistro-reports-scheduler-" + bwcVersion + ".zip") + File file = new File(dir, "opensearch-reports-scheduler-" + bwcVersion + ".zip") if (!file.exists()) { new URL(bwcReportsSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} } @@ -389,7 +389,7 @@ task prepareBwcTests { if (!dir.exists()) { dir.mkdirs() } - File file = new File(dir, "opendistro-reports-scheduler-" + project.version + ".zip") + File file = new File(dir, "opensearch-reports-scheduler-" + project.version + ".zip") if (!file.exists()) { new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }} } diff --git a/reports-scheduler/src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt b/reports-scheduler/src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt index c37a396f..78605ff6 100644 --- a/reports-scheduler/src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt +++ b/reports-scheduler/src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt @@ -50,8 +50,8 @@ class ReportsSchedulerBackwardsCompatibilityIT : PluginRestTestCase() { val pluginNames = plugins.map { plugin -> plugin["name"] }.toSet() when (CLUSTER_TYPE) { ClusterType.OLD -> { - assertTrue(pluginNames.contains("opendistro-reports-scheduler")) - assertTrue(pluginNames.contains("opendistro-job-scheduler")) + assertTrue(pluginNames.contains("opensearch-reports-scheduler")) + assertTrue(pluginNames.contains("opensearch-job-scheduler")) createBasicReportDefinition() } ClusterType.MIXED -> {