diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index aa31d570688..0365333391a 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -7,9 +7,6 @@ name: Test and Build Notifications on: [push, pull_request] -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - jobs: Get-CI-Image-Tag: uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main @@ -23,27 +20,34 @@ jobs: fail-fast: false matrix: java: [21, 23] + os: + - ubuntu-24.04-arm # arm64-preview + - ubuntu-24.04 # x64 + # Job name name: Build Notifications with JDK ${{ matrix.java }} on linux - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} + - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} # notifications - name: Checkout Notifications - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build with Gradle run: | @@ -66,15 +70,15 @@ jobs: shell: bash - name: Upload Artifacts for notifications plugin - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: notifications-plugin-${{ matrix.os }} + name: notifications-plugin-${{ matrix.os }}-JDK${{ matrix.java }} path: notifications-build/notifications - name: Upload Artifacts for notifications-core plugin - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: notifications-core-plugin-${{ matrix.os }} + name: notifications-core-plugin-${{ matrix.os }}-JDK${{ matrix.java }} path: notifications-build/notifications-core build-windows-macos: @@ -101,14 +105,14 @@ jobs: steps: - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} # notifications - name: Checkout Notifications - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This is a hack, but this step creates a link to the X: mounted drive, which makes the path # short enough to work on Windows @@ -132,13 +136,13 @@ jobs: shell: bash - name: Upload Artifacts for notifications plugin - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: notifications-plugin-${{ matrix.os }} + name: notifications-plugin-${{ matrix.os }}-JDK${{ matrix.java }} path: notifications-build/notifications - name: Upload Artifacts for notifications-core plugin - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: notifications-core-plugin-${{ matrix.os }} + name: notifications-core-plugin-${{ matrix.os }}-JDK${{ matrix.java }} path: notifications-build/notifications-core diff --git a/.github/workflows/security-notifications-test-workflow.yml b/.github/workflows/security-notifications-test-workflow.yml index 90a640d067f..9a8a17dbffe 100644 --- a/.github/workflows/security-notifications-test-workflow.yml +++ b/.github/workflows/security-notifications-test-workflow.yml @@ -17,19 +17,22 @@ jobs: fail-fast: false matrix: java: [21, 23] + os: + - ubuntu-24.04-arm # arm64-preview + - ubuntu-24.04 # x64 - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} # notifications - name: Checkout Notifications - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Temporarily exclude tests which causing CI to fail. Tracking in #251 - name: Build with Gradle diff --git a/notifications/build.gradle b/notifications/build.gradle index 4583ce3cbb4..808648e20ba 100644 --- a/notifications/build.gradle +++ b/notifications/build.gradle @@ -6,9 +6,9 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") - buildVersionQualifier = System.getProperty("build.version_qualifier", "") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' diff --git a/notifications/notifications/src/main/kotlin/org/opensearch/notifications/index/NotificationConfigIndex.kt b/notifications/notifications/src/main/kotlin/org/opensearch/notifications/index/NotificationConfigIndex.kt index bc63de0e0ce..2dd593dec99 100644 --- a/notifications/notifications/src/main/kotlin/org/opensearch/notifications/index/NotificationConfigIndex.kt +++ b/notifications/notifications/src/main/kotlin/org/opensearch/notifications/index/NotificationConfigIndex.kt @@ -22,7 +22,7 @@ import org.opensearch.action.index.IndexRequest import org.opensearch.action.index.IndexResponse import org.opensearch.action.search.SearchRequest import org.opensearch.action.search.SearchResponse -import org.opensearch.action.support.master.AcknowledgedResponse +import org.opensearch.action.support.clustermanager.AcknowledgedResponse import org.opensearch.client.Client import org.opensearch.cluster.service.ClusterService import org.opensearch.common.unit.TimeValue