Merge branch 'main' of https://github.com/opensearch-project/asynchro…

…nous-search into 2.2relnotes

build.gradle

@@ -10,8 +10,8 @@ buildscript {
         distribution = 'oss-zip'
         opensearch_group = "org.opensearch"
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
-        opendistro_plugin_version = System.getProperty("bwc.version", "1.13.0.1")
+        opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
+        opensearch_plugin_version = System.getProperty("bwc.version", "1.1.0.0")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -245,24 +245,24 @@ ext.getPluginResource = { download_to_folder, download_from_src ->
 }
 
 String baseName = "asynSearchCluster"
-String bwcVersion = "1.13.0.1"
+String bwcVersion = "1.1.0.0"
 String bwcFilePath = "src/test/resources/org/opensearch/search/asynchronous/bwc/"
-String bwcRemoteFile = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-asynchronous-search/opendistro-asynchronous-search-1.13.0.1.zip"
+String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-asynchronous-search-1.1.0.0.zip"
 getPluginResource(bwcFilePath + bwcVersion, bwcRemoteFile)
 // Creates two test clusters of previous version and loads opensearch plugin of bwcVersion
 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
                 RegularFile call() throws Exception {
                     return new RegularFile() {
                         @Override
                         File getAsFile() {
-                            return fileTree(bwcFilePath + opendistro_plugin_version).getSingleFile()
+                            return fileTree(bwcFilePath + opensearch_plugin_version).getSingleFile()
                         }
                     }
                 }

release-notes/opensearch-asynchronous-search.release-notes-2.2.0.0.md

@@ -4,7 +4,7 @@ Compatible with OpenSearch 2.2.0
 
 ### Maintenance
 * bump version to 2.2.0 ([#163](https://github.com/opensearch-project/asynchronous-search/pull/163))
-* Changed BWC tests to use 1.1.0 plugin version ([#162](https://github.com/opensearch-project/job-scheduler/pull/215))
+* Changed BWC tests to use 1.1.0 plugin version ([#162](https://github.com/opensearch-project/asynchronous-search/pull/162))
 
 ### Documentation
 * Added 2.2 release notes. ([#164](https://github.com/opensearch-project/asynchronous-search/pull/164))

src/test/java/org/opensearch/search/asynchronous/bwc/AsyncSearchBackwardsCompatibilityIT.java

@@ -56,9 +56,6 @@ public void testBackwardsCompatibility() throws Exception {
                     plugins.stream().map(map -> map.get("name")).collect(Collectors.toSet());
             switch (CLUSTER_TYPE) {
                 case OLD:
-                    Assert.assertTrue(pluginNames.contains("opendistro-asynchronous-search"));
-                    testAsyncSearchAndSettingsApi(true);
-                    break;
                 case MIXED:
                     Assert.assertTrue(pluginNames.contains("opensearch-asynchronous-search"));
                     testAsyncSearchAndSettingsApi(true);