Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing BWC Tests #1027

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Fix failing BWC Tests #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bc81e9
Fix bwc tests
cwperks Sep 7, 2023
4306541
Debug statements
cwperks Sep 7, 2023
e505644
In mixed cluster check for either old or new name
cwperks Sep 7, 2023
11e28b5
Run with -i
cwperks Sep 7, 2023
ad90635
Set bind_host and publish_host
cwperks Sep 8, 2023
7e9cdcf
Increment bwcVersionShort to 2.11.0
cwperks Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_bwc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ jobs:
- name: Run AD Backwards Compatibility Tests
run: |
echo "Running backwards compatibility tests ..."
./gradlew bwcTestSuite -Dtests.security.manager=false
./gradlew bwcTestSuite -Dtests.security.manager=false -i
33 changes: 27 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* GitHub history for details.
*/

import java.nio.file.Paths
import java.util.concurrent.Callable
import org.opensearch.gradle.test.RestIntegTestTask
import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
Expand All @@ -35,12 +36,8 @@ buildscript {
js_resource_folder = "src/test/resources/job-scheduler"
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
bwcVersionShort = "2.10.0"
bwcVersion = bwcVersionShort + ".0"
bwcOpenSearchADDownload = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + bwcVersionShort + '/latest/linux/x64/tar/builds/' +
'opensearch/plugins/opensearch-anomaly-detection-' + bwcVersion + '.zip'
bwcOpenSearchJSDownload = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + bwcVersionShort + '/latest/linux/x64/tar/builds/' +
'opensearch/plugins/opensearch-job-scheduler-' + bwcVersion + '.zip'
bwcVersionShort = "2.11.0"
bwcVersion = bwcVersionShort + ".0-SNAPSHOT"
baseName = "adBwcCluster"
bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/"
bwcJobSchedulerPath = bwcFilePath + "job-scheduler/"
Expand All @@ -65,12 +62,32 @@ buildscript {
}

plugins {
id "de.undercouch.download" version "5.3.0"
id 'com.netflix.nebula.ospackage' version "11.0.0"
id "com.diffplug.spotless" version "6.18.0"
id 'java-library'
id 'org.gradle.test-retry' version '1.5.4'
}

ext {
getPluginDownloadLink = { plugin, version ->
var repo = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/" +
"opensearch-$plugin/$version/"
var metadataFile = Paths.get(projectDir.toString(), "build", "maven-metadata.xml").toAbsolutePath().toFile()
download.run {
src repo + "maven-metadata.xml"
dest metadataFile
}
def metadata = new XmlParser().parse(metadataFile)
def securitySnapshotVersion = metadata.versioning.snapshotVersions[0].snapshotVersion[0].value[0].text()

return repo + "opensearch-$plugin-${securitySnapshotVersion}.zip"
}

bwcOpenSearchADDownload = getPluginDownloadLink('anomaly-detection', bwcVersion)
bwcOpenSearchJSDownload = getPluginDownloadLink('job-scheduler', bwcVersion)
}

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
Expand Down Expand Up @@ -501,6 +518,10 @@ task integTestRemote(type: RestIntegTestTask) {
}
}
}))
nodes.each { node ->
node.setting("network.bind_host", "127.0.0.1")
node.setting("network.publish_host", "127.0.0.1")
}
setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
setting 'http.content_type.required', 'true'
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public void testBackwardsCompatibility() throws Exception {
case MIXED:
// TODO: We have no way to specify whether send request to old node or new node now.
// Add more test later when it's possible to specify request node.
Assert.assertTrue(pluginNames.contains("opensearch-anomaly-detection"));
Assert.assertTrue(pluginNames.contains("opensearch-anomaly-detection") || pluginNames.contains("opensearch-time-series-analytics"));
Assert.assertTrue(pluginNames.contains("opensearch-job-scheduler"));

// Create single entity detector and start realtime job
Expand Down