[1.3] Add Bwc Test for OS 1.1 (#417) (#423)

* Add Bwc Test for OS 1.1 (#417) Signed-off-by: Shenoy Pratik <[email protected]> * Fix job-scheduler url Signed-off-by: Joshua Li <[email protected]> * Remove artifact zips Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: Joshua Li <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]>
opensearch-project · Aug 17, 2022 · f255abd · f255abd
1 parent 9976c92
commit f255abd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -25,6 +25,12 @@ jobs:
       - name: Checkout Reports Scheduler
         uses: actions/checkout@v2
 
+      - name: RunBackwards Compatibility Tests
+        run: |
+          cd reports-scheduler
+          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
@@ -240,7 +240,7 @@ 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"
+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"
 
 testClusters.integTest {
     testDistribution = "INTEG_TEST"
@@ -280,18 +280,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<RegularFile>(){
                 @Override
@@ -303,7 +303,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 }}
                             }
@@ -322,7 +322,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 }}
                             }
@@ -354,7 +354,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/.../src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt b/.../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 -> {

diff --git a/...esources/bwc/job-scheduler/1.3.5.0-SNAPSHOT/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip b/...esources/bwc/job-scheduler/1.3.5.0-SNAPSHOT/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip
diff --git a/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip b/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip