Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/multi-node-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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({
Expand Down
3 changes: 1 addition & 2 deletions release-notes/create_release_notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
@@ -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)