diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 6f573cc50..2b62909bf 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -28,10 +28,10 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.0.0-alpha1' + ref: '1.0.0-alpha2' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha2 -Dbuild.snapshot=false # dependencies: common-utils - name: Checkout common-utils uses: actions/checkout@v2 @@ -40,7 +40,7 @@ jobs: path: common-utils - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 # dependencies: job-scheduler - name: Checkout job-scheduler uses: actions/checkout@v2 @@ -49,7 +49,7 @@ jobs: path: job-scheduler - name: Build job-scheduler working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 -Dbuild.snapshot=false # dependencies: alerting-notification - name: Checkout alerting uses: actions/checkout@v2 @@ -59,7 +59,7 @@ jobs: path: alerting - name: Build alerting working-directory: ./alerting - run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 + run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch_version=1.0.0-alpha2 # index-management - name: Checkout Branch uses: actions/checkout@v2 diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 1b6d7347d..75d847d32 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -30,10 +30,10 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.0.0-alpha1' + ref: '1.0.0-alpha2' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha2 -Dbuild.snapshot=false # dependencies: common-utils - name: Checkout common-utils uses: actions/checkout@v2 @@ -42,7 +42,7 @@ jobs: path: common-utils - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 # dependencies: job-scheduler - name: Checkout job-scheduler uses: actions/checkout@v2 @@ -51,7 +51,7 @@ jobs: path: job-scheduler - name: Build job-scheduler working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 -Dbuild.snapshot=false # dependencies: alerting-notification - name: Checkout alerting uses: actions/checkout@v2 @@ -61,7 +61,7 @@ jobs: path: alerting - name: Build alerting working-directory: ./alerting - run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.0.0-alpha1 + run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch_version=1.0.0-alpha2 # index-management - name: Checkout Branch uses: actions/checkout@v2 diff --git a/build.gradle b/build.gradle index f0eba1ed1..0774dda40 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ import java.util.function.Predicate buildscript { ext { - opensearch_version = System.getProperty("opensearch_version", "1.0.0-alpha1") + opensearch_version = System.getProperty("opensearch_version", "1.0.0-alpha2") kotlin_version = System.getProperty("kotlin.version", "1.3.72") } @@ -130,17 +130,17 @@ ext { } group = "com.amazon.opendistroforelasticsearch" -version = "${opendistroVersion}.0" +version = "${opendistroVersion}.0-beta1" dependencies { compileOnly "org.opensearch:opensearch:${opensearch_version}" - compileOnly "com.amazon.opendistroforelasticsearch:opensearch-job-scheduler-spi:1.0.0.0-beta1" + compileOnly "com.amazon.opendistroforelasticsearch:opensearch-job-scheduler-spi:1.0.0.0-alpha2" compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}" compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' compile "org.jetbrains:annotations:13.0" - compile "com.amazon.opendistroforelasticsearch:notification:1.0.0.1" - compile "com.amazon.opendistroforelasticsearch:common-utils:1.0.0.0" + compile "com.amazon.opendistroforelasticsearch:notification:1.0.0.0-beta1" + compile "com.amazon.opendistroforelasticsearch:common-utils:1.0.0.0-alpha2" compile "com.github.seancfoley:ipaddress:5.3.3" testCompile "org.opensearch.test:framework:${opensearch_version}" @@ -220,7 +220,7 @@ File repo = file("$buildDir/testclusters/repo") def _numNodes = findProperty('numNodes') as Integer ?: 1 testClusters.integTest { plugin(project.tasks.bundlePlugin.archiveFile) - testDistribution = "OSS" + testDistribution = "ARCHIVE" // Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1 if (_numNodes > 1) numberOfNodes = _numNodes // When running integration tests it doesn't forward the --debug-jvm to the cluster anymore @@ -335,7 +335,7 @@ println("mixed cluster flag: $mixedClusterFlag") mixedClusterTest.dependsOn(bundlePlugin) testClusters.mixedCluster { - testDistribution = "OSS" + testDistribution = "ARCHIVE" if (_numNodes > 1) numberOfNodes = _numNodes getNodes().each { node -> node.plugin(provider({ diff --git a/release-notes/create_release_notes.py b/release-notes/create_release_notes.py index 9943e975c..efdf9a8f2 100644 --- a/release-notes/create_release_notes.py +++ b/release-notes/create_release_notes.py @@ -33,8 +33,7 @@ "](" + link_prefix + pr_num + "))", line) sys.stdout.write(line) -# Rename file to be consistent with ODFE standards -new_file_path = "opendistro-for-elasticsearch-" + plugin_name + ".release-notes-" + \ +new_file_path = "opensearch-" + plugin_name + ".release-notes-" + \ plugin_version + ".md" os.rename(file_path, new_file_path) diff --git a/release-notes/opensearch-index-management.release-notes-1.0.0.0-beta1.md b/release-notes/opensearch-index-management.release-notes-1.0.0.0-beta1.md new file mode 100644 index 000000000..f45c757bd --- /dev/null +++ b/release-notes/opensearch-index-management.release-notes-1.0.0.0-beta1.md @@ -0,0 +1,20 @@ +## Version 1.0.0.0-beta1 2021-04-26 + +Compatible with OpenSearch 1.0.0 + +### Enhancements + +* migrate plugin to be compatible with OpenSearch [#1](https://github.com/opensearch-project/index-management/pull/1) +* rename plugin [#5](https://github.com/opensearch-project/index-management/pull/5) + +### Infrastructure + +* update github workflows [#5](https://github.com/opensearch-project/index-management/pull/5) + +### Documentation + +* update NOTICE, README, LICENSE, CONTRIBUTING files; add MAINTAINERS file; update issue and PR template files [#1](https://github.com/opensearch-project/index-management/pull/1) +* add SPDX license header for gradle files [#2](https://github.com/opensearch-project/index-management/pull/2) +* add SPDX license header to all files [#3](https://github.com/opensearch-project/index-management/pull/3) +* update MAINTAINERS file [#5](https://github.com/opensearch-project/index-management/pull/5) +* add release notes for 1.0.0.0-beta1 release [#6](https://github.com/opensearch-project/index-management/pull/6)