From 7c33ec8c7cf0610b71a9ee3a72672b716a245ded Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:11:43 -0400 Subject: [PATCH] [Backport 2.x] Onboard jenkins prod docker images to github actions (#77) * Onboard jenkins prod docker images to github actions (#76) * Onboard jenkins prod docker images to github actions Signed-off-by: Peter Zhu * Add more Signed-off-by: Peter Zhu * Add more Signed-off-by: Peter Zhu * Add more Signed-off-by: Peter Zhu * Add more Signed-off-by: Peter Zhu --------- Signed-off-by: Peter Zhu (cherry picked from commit c85334e289fdd1784c1d37353c86f208239b270b) Signed-off-by: github-actions[bot] * remove jdk21 Signed-off-by: Peter Zhu * Explicitly set JAVA_HOME to JDK-11 for Gradle build Signed-off-by: Andriy Redko * Update OpenSearch core version to 2.12.0-SNAPSHOT Signed-off-by: Andriy Redko * Removed explicit -Druntime.java version specifier for Gradle check Signed-off-by: Andriy Redko --------- Signed-off-by: Peter Zhu Signed-off-by: github-actions[bot] Signed-off-by: Andriy Redko Co-authored-by: github-actions[bot] Co-authored-by: Peter Zhu Co-authored-by: Andriy Redko --- .github/workflows/check.yml | 43 ++++++++++++++++++++++++++++++++----- build.gradle | 2 +- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f8d2f1c..9ed11c9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,18 +2,51 @@ name: Gradle Check on: [pull_request] jobs: - precommit: + Get-CI-Image-Tag: + uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main + with: + product: opensearch + + precommit-linux: + needs: Get-CI-Image-Tag + strategy: + matrix: + java: [ 11, 17 ] + if: github.repository == 'opensearch-project/custom-codecs' + runs-on: ubuntu-latest + 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 + + steps: + - uses: actions/checkout@v3 + - name: Run Gradle (check) + run: | + # https://github.com/opensearch-project/opensearch-build/issues/4191 + chown -R opensearch:opensearch `pwd` + su opensearch -c "source /etc/profile.d/java_home.sh && ./gradlew check -Dorg.gradle.java.home=/opt/java/openjdk-${{ matrix.java }}" + - name: Run Gradle (assemble) + run: | + # https://github.com/opensearch-project/opensearch-build/issues/4191 + chown -R opensearch:opensearch `pwd` + su opensearch -c "source /etc/profile.d/java_home.sh && ./gradlew assemble -Dorg.gradle.java.home=/opt/java/openjdk-${{ matrix.java }}" + + precommit-windows-macos: if: github.repository == 'opensearch-project/custom-codecs' - runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + java: [ 11, 17 ] + os: [windows-latest, macos-latest] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: - java-version: 11 + java-version: ${{ matrix.java }} distribution: temurin cache: gradle - name: Run Gradle (check) diff --git a/build.gradle b/build.gradle index aa2dba9..0c9ad22 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "2.11.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.12.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") }