diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 16daf9804..f2509c681 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,28 +28,28 @@ jobs: - name: Assemble anomaly-detection run: | - ./gradlew assemble -Dopensearch.version=1.2.3-SNAPSHOT - echo "Creating ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT ..." - mkdir -p ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT - echo "Copying ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT ..." + ./gradlew assemble -Dopensearch.version=1.2.4-SNAPSHOT + echo "Creating ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT ..." + mkdir -p ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT + echo "Copying ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT ..." ls ./build/distributions/ - cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT - echo "Copied ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT ..." - ls ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.3.0-SNAPSHOT + cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT + echo "Copied ./build/distributions/*.zip to ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT ..." + ls ./src/test/resources/org/opensearch/ad/bwc/anomaly-detection/1.2.4.0-SNAPSHOT - name: Build and Run Tests run: | - ./gradlew build -Dopensearch.version=1.2.3-SNAPSHOT + ./gradlew build -Dopensearch.version=1.2.4-SNAPSHOT - name: Publish to Maven Local run: | - ./gradlew publishToMavenLocal -Dopensearch.version=1.2.3-SNAPSHOT + ./gradlew publishToMavenLocal -Dopensearch.version=1.2.4-SNAPSHOT - name: Multi Nodes Integration Testing run: | ./gradlew integTest -PnumNodes=3 - name: Pull and Run Docker run: | plugin=`ls build/distributions/*.zip` - version=1.2.3-SNAPSHOT - plugin_version=1.2.3.0-SNAPSHOT + version=1.2.4-SNAPSHOT + plugin_version=1.2.4.0-SNAPSHOT echo Using OpenSearch $version with AD $plugin_version cd .. if docker pull opensearchstaging/opensearch:$version diff --git a/.gitignore b/.gitignore index 0ac89afe9..7ed43c682 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,3 @@ out/ .classpath .vscode bin/ -src/test/resources/job-scheduler \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6c367e8b5..c66723633 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.2.3-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.4-SNAPSHOT") // 1.2.0 -> 1.2.0.0, and 1.2.0-SNAPSHOT -> 1.2.0.0-SNAPSHOT opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build) @@ -301,7 +301,7 @@ String bwcFilePath = "src/test/resources/org/opensearch/ad/bwc/" testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["7.10.2","1.2.3-SNAPSHOT"] + versions = ["7.10.2","1.2.4-SNAPSHOT"] numberOfNodes = 3 plugin(provider(new Callable(){ @Override diff --git a/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip b/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip deleted file mode 100644 index ff5a36716..000000000 Binary files a/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip and /dev/null differ diff --git a/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip b/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip new file mode 100644 index 000000000..726af7348 Binary files /dev/null and b/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip differ diff --git a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.3.0-SNAPSHOT/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.3.0-SNAPSHOT/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip deleted file mode 100644 index ff5a36716..000000000 Binary files a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.3.0-SNAPSHOT/opensearch-job-scheduler-1.2.3.0-SNAPSHOT.zip and /dev/null differ diff --git a/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.4.0-SNAPSHOT/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.4.0-SNAPSHOT/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip new file mode 100644 index 000000000..726af7348 Binary files /dev/null and b/src/test/resources/org/opensearch/ad/bwc/job-scheduler/1.2.4.0-SNAPSHOT/opensearch-job-scheduler-1.2.4.0-SNAPSHOT.zip differ