From 8415a96db62579f861489d953fc0ca237acc1fe0 Mon Sep 17 00:00:00 2001 From: opensearch-ci-bot Date: Sat, 5 Nov 2022 00:14:11 +0000 Subject: [PATCH 1/3] Increment version to 2.5.0-SNAPSHOT Signed-off-by: opensearch-ci-bot --- build.gradle | 2 +- bwc-test/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2e03803c11..6e22bc0336 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.4.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 583d9d173c..fdeeac96e4 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -47,7 +47,7 @@ ext { buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.4.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT") opensearch_group = "org.opensearch" } repositories { @@ -76,13 +76,13 @@ dependencies { String bwcVersion = "2.3.0.0"; String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" -String projectVersion = "2.4.0.0" +String projectVersion = "2.5.0.0" 2.times {i -> testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["2.3.0","2.4.0"] + versions = ["2.3.0","2.5.0"] numberOfNodes = 3 plugin(provider(new Callable() { @Override From e8dacc1d596c57dd6786164a822908f2d086ecef Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Fri, 4 Nov 2022 13:20:47 -0400 Subject: [PATCH 2/3] Upgrading versions in missing places Signed-off-by: Darshit Chanpura --- .github/workflows/plugin_install.yml | 6 +++--- bwc-test/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index 3cf1462618..5f290fac25 100644 --- a/.github/workflows/plugin_install.yml +++ b/.github/workflows/plugin_install.yml @@ -85,9 +85,9 @@ jobs: - name: Download OpenSearch Core run: | cd .. - Invoke-WebRequest https://artifacts.opensearch.org/snapshots/core/opensearch/2.4.0-SNAPSHOT/opensearch-min-2.4.0-SNAPSHOT-windows-x64-latest.zip -Outfile opensearch-2.4.0.zip - tar -xzf opensearch-2.4.0.zip - del opensearch-2.4.0.zip + Invoke-WebRequest https://artifacts.opensearch.org/snapshots/core/opensearch/2.5.0-SNAPSHOT/opensearch-min-2.5.0-SNAPSHOT-windows-x64-latest.zip -Outfile opensearch-2.5.0.zip + tar -xzf opensearch-2.5.0.zip + del opensearch-2.5.0.zip Rename-Item opensearch-* Opensearch - name: Build Security Plugin with Gradle diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index fdeeac96e4..6c93dc3062 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -73,7 +73,7 @@ dependencies { testImplementation "org.opensearch.test:framework:${opensearch_version}" } -String bwcVersion = "2.3.0.0"; +String bwcVersion = "2.4.0.0"; String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" String projectVersion = "2.5.0.0" @@ -82,7 +82,7 @@ String projectVersion = "2.5.0.0" testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["2.3.0","2.5.0"] + versions = ["2.4.0","2.5.0"] numberOfNodes = 3 plugin(provider(new Callable() { @Override From cc31b3f2c8eac56fcf634d0992c7553629fa3d91 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Thu, 17 Nov 2022 13:24:13 -0500 Subject: [PATCH 3/3] Updates ci.yml to point to correct bwc version Signed-off-by: Darshit Chanpura --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2638ee8e16..c855bc04f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,12 +63,13 @@ jobs: - run: | echo "Running backwards compatibility tests ..." security_plugin_version_no_snapshot=$(./gradlew properties -q | grep -E '^version:' | awk '{print $2}' | sed 's/-SNAPSHOT//g') + bwc_version=2.4.0 cp -r build/ ./bwc-test/ mkdir ./bwc-test/src/test/resources/security_plugin_version_no_snapshot cp build/distributions/opensearch-security-${security_plugin_version_no_snapshot}.zip ./bwc-test/src/test/resources/${security_plugin_version_no_snapshot} - mkdir bwc-test/src/test/resources/2.3.0.0 - wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.3.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.3.0.0.zip - mv opensearch-security-2.3.0.0.zip bwc-test/src/test/resources/2.3.0.0/ + mkdir bwc-test/src/test/resources/${bwc_version}.0 + wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${bwc_version}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-${bwc_version}.0.zip + mv opensearch-security-${bwc_version}.0.zip bwc-test/src/test/resources/${bwc_version}.0/ cd bwc-test/ ./gradlew bwcTestSuite -Dtests.security.manager=false