Skip to content

Commit

Permalink
Remove hardcoded OpenSearch core versions and security plugin versions
Browse files Browse the repository at this point in the history
Signed-off-by: cliu123 <lc12251109@gmail.com>
  • Loading branch information
cliu123 committed Apr 4, 2022
1 parent c28ff0d commit 6db9676
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,23 @@ jobs:

- run: ./gradlew clean assemble

- id: security-plugin-version
uses: madhead/read-java-properties@66cc8c88f5c6f6069ebfb42586024dd6ffe2e451
with:
file: gradle.properties
property: security-plugin.version

- uses: actions/setup-java@v1
with:
java-version: 11

- run: ./gradlew clean assemble
- run: test -s ./build/opensearch-security-${{ steps.security-plugin-version.outputs.value }}-SNAPSHOT.jar
- run: |
export security_plugin_version=`./gradlew properties -q | grep -E "^version:" | awk '{print $2}'`
test -s ./build/opensearch-security-$security_plugin_version.jar
- run: ./gradlew clean assemble -Dbuild.snapshot=false
- run: test -s ./build/opensearch-security-${{ steps.security-plugin-version.outputs.value }}.jar
- run: test -s ./build/opensearch-security-$security_plugin_version.jar

- run: ./gradlew clean assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=alpha1
- run: test -s ./build/opensearch-security-${{ steps.security-plugin-version.outputs.value }}-alpha1.jar
- run: test -s ./build/opensearch-security-$security_plugin_version-alpha1.jar

- run: ./gradlew clean assemble -Dbuild.version_qualifier=alpha1
- run: test -s ./build/opensearch-security-${{ steps.security-plugin-version.outputs.value }}-alpha1-SNAPSHOT.jar
- run: test -s ./build/opensearch-security-$security_plugin_version-alpha1-SNAPSHOT.jar

- name: List files in the build directory if there was an error
run: ls -al ./build/
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/plugin_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ jobs:
steps:
- uses: actions/checkout@v2

- id: opensearch-version
uses: madhead/read-java-properties@66cc8c88f5c6f6069ebfb42586024dd6ffe2e451
with:
file: gradle.properties
property: opensearch-core.version

- name: Set up JDK
uses: actions/setup-java@v1
with:
Expand All @@ -25,7 +19,8 @@ jobs:

- name: Download OpenSearch Core
run: |
wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${{ steps.opensearch-version.outputs.value }}/latest/linux/x64/builds/opensearch/dist/opensearch-min-${{ steps.opensearch-version.outputs.value }}-linux-x64.tar.gz
export opensearch_version=`./gradlew properties -q | grep "opensearch_version:" | awk '{print $2}'`
wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/$opensearch_version/latest/linux/x64/builds/opensearch/dist/opensearch-min-$opensearch_version-linux-x64.tar.gz
tar -xzf opensearch-*.tar.gz
rm -f opensearch-*.tar.gz
Expand Down
4 changes: 0 additions & 4 deletions gradle.properties

This file was deleted.

0 comments on commit 6db9676

Please sign in to comment.