From 7bc81e9d81bf8fc8851a0ffbfddcaf339e17addb Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 7 Sep 2023 15:29:32 -0400 Subject: [PATCH 1/6] Fix bwc tests Signed-off-by: Craig Perkins --- build.gradle | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8102e1b20..1803810f0 100644 --- a/build.gradle +++ b/build.gradle @@ -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 @@ -36,11 +37,7 @@ buildscript { 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' + bwcVersion = bwcVersionShort + ".0-SNAPSHOT" baseName = "adBwcCluster" bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/" bwcJobSchedulerPath = bwcFilePath + "job-scheduler/" @@ -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" } From 430654108909cac993e6ba5d40eb975f611f5137 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 7 Sep 2023 16:11:43 -0400 Subject: [PATCH 2/6] Debug statements Signed-off-by: Craig Perkins --- .github/workflows/test_bwc.yml | 2 +- .../java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml index d7aa2328d..d4a81cdce 100644 --- a/.github/workflows/test_bwc.yml +++ b/.github/workflows/test_bwc.yml @@ -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 diff --git a/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java b/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java index 0f513b502..e9fb56f9c 100644 --- a/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java +++ b/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java @@ -167,6 +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. + System.out.println("pluginNames: " + pluginNames); Assert.assertTrue(pluginNames.contains("opensearch-anomaly-detection")); Assert.assertTrue(pluginNames.contains("opensearch-job-scheduler")); From e5056443bfe5bcee2f7502afe86b7f1881628d93 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 7 Sep 2023 16:35:31 -0400 Subject: [PATCH 3/6] In mixed cluster check for either old or new name Signed-off-by: Craig Perkins --- .github/workflows/test_bwc.yml | 2 +- .../java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml index d4a81cdce..d7aa2328d 100644 --- a/.github/workflows/test_bwc.yml +++ b/.github/workflows/test_bwc.yml @@ -42,4 +42,4 @@ jobs: - name: Run AD Backwards Compatibility Tests run: | echo "Running backwards compatibility tests ..." - ./gradlew bwcTestSuite -Dtests.security.manager=false -i + ./gradlew bwcTestSuite -Dtests.security.manager=false diff --git a/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java b/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java index e9fb56f9c..8d444c395 100644 --- a/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java +++ b/src/test/java/org/opensearch/ad/bwc/ADBackwardsCompatibilityIT.java @@ -167,8 +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. - System.out.println("pluginNames: " + pluginNames); - 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 From 11e28b57f6f0b9fe7f37ff63584c04307a506124 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 7 Sep 2023 16:50:34 -0400 Subject: [PATCH 4/6] Run with -i Signed-off-by: Craig Perkins --- .github/workflows/test_bwc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml index d7aa2328d..d4a81cdce 100644 --- a/.github/workflows/test_bwc.yml +++ b/.github/workflows/test_bwc.yml @@ -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 From ad906358c613bc097e8c3de5bfb3f05a6c957ad5 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 8 Sep 2023 10:10:04 -0400 Subject: [PATCH 5/6] Set bind_host and publish_host Signed-off-by: Craig Perkins --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 1803810f0..6e62d38ac 100644 --- a/build.gradle +++ b/build.gradle @@ -518,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' } From 7e9cdcf39c04da155bf33b43cd0714f6e4a4fb7a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 8 Sep 2023 17:07:57 -0400 Subject: [PATCH 6/6] Increment bwcVersionShort to 2.11.0 Signed-off-by: Craig Perkins --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6e62d38ac..22617e570 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ 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" + bwcVersionShort = "2.11.0" bwcVersion = bwcVersionShort + ".0-SNAPSHOT" baseName = "adBwcCluster" bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/"