From 2a1ab8ca517bad13a709c85e31b491039b92b800 Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:10:31 -0800 Subject: [PATCH 1/7] Add alpha1 qualifier Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- notifications/build.gradle | 5 +++-- .../notifications/index/NotificationConfigIndex.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/notifications/build.gradle b/notifications/build.gradle index 4583ce3c..f70b9f60 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' @@ -56,6 +56,7 @@ buildscript { apply plugin: 'base' apply plugin: 'jacoco' +apply plugin: 'com.gradleup.shadow' apply plugin: 'io.gitlab.arturbosch.detekt' apply from: 'build-tools/merged-coverage.gradle' 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 bc63de0e..2dd593de 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 From 22eae21aa8567a10109a773e512bbdfeb2496892 Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:19:10 -0800 Subject: [PATCH 2/7] Add alpha1 qualifier Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- notifications/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/notifications/build.gradle b/notifications/build.gradle index f70b9f60..808648e2 100644 --- a/notifications/build.gradle +++ b/notifications/build.gradle @@ -56,7 +56,6 @@ buildscript { apply plugin: 'base' apply plugin: 'jacoco' -apply plugin: 'com.gradleup.shadow' apply plugin: 'io.gitlab.arturbosch.detekt' apply from: 'build-tools/merged-coverage.gradle' From 09ad4d997d81620b5ff35e1695c259a53da0a90d Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:27:51 -0800 Subject: [PATCH 3/7] update upload-artifacts version to v4 Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- .../workflows/notifications-test-and-build-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index aa31d570..dd0beeec 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -66,13 +66,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 }} 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 }} path: notifications-build/notifications-core @@ -132,13 +132,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 }} 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 }} path: notifications-build/notifications-core From 9b7d9555931735187d09b3b0e6a2bd380071e725 Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:04:29 -0800 Subject: [PATCH 4/7] update naming for artifacts to resolve naming conflicts Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- .../workflows/notifications-test-and-build-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index dd0beeec..1813e350 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -68,13 +68,13 @@ jobs: - name: Upload Artifacts for notifications plugin 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@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: @@ -134,11 +134,11 @@ jobs: - name: Upload Artifacts for notifications plugin 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@v4 with: - name: notifications-core-plugin-${{ matrix.os }} + name: notifications-core-plugin-${{ matrix.os }}-JDK${{ matrix.java }} path: notifications-build/notifications-core From 985225b88e69e0c8e0fcd241a3fb7b3cf2bf80f1 Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:35:55 -0800 Subject: [PATCH 5/7] update to fix glibc issues Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- .github/workflows/notifications-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index 1813e350..81af8cd0 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -36,7 +36,7 @@ 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 }} @@ -101,7 +101,7 @@ 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 }} From 3cba1cd12d969b7ca93647a6cf9a9c71b520ed08 Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:28:55 -0800 Subject: [PATCH 6/7] update to fix glibc issues Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- .../notifications-test-and-build-workflow.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index 81af8cd0..5015c052 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -23,18 +23,25 @@ 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@v4 with: @@ -43,7 +50,7 @@ jobs: # notifications - name: Checkout Notifications - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build with Gradle run: | @@ -108,7 +115,7 @@ jobs: # 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 From e3dc0e1e914198c3be94be4c0461422967cab98d Mon Sep 17 00:00:00 2001 From: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> Date: Tue, 4 Feb 2025 13:06:54 -0800 Subject: [PATCH 7/7] fix ci failures Signed-off-by: vikhy-aws <191836418+vikhy-aws@users.noreply.github.com> --- .../workflows/notifications-test-and-build-workflow.yml | 3 --- .../workflows/security-notifications-test-workflow.yml | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index 5015c052..03653333 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 diff --git a/.github/workflows/security-notifications-test-workflow.yml b/.github/workflows/security-notifications-test-workflow.yml index 90a640d0..9a8a17db 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