From 372a88933b1464af8dac7f37c4f81553f8ff4cc0 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 11 Oct 2023 16:53:26 -0400 Subject: [PATCH] Test more Signed-off-by: Peter Zhu --- .github/workflows/get-ci-image-tag.yml | 35 +++++++ .github/workflows/test-workflow.yml | 121 +++++++++++-------------- 2 files changed, 87 insertions(+), 69 deletions(-) create mode 100644 .github/workflows/get-ci-image-tag.yml diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml new file mode 100644 index 000000000..c00d8f1f1 --- /dev/null +++ b/.github/workflows/get-ci-image-tag.yml @@ -0,0 +1,35 @@ +name: Get CI Image Tag +on: + workflow_call: + inputs: + platform: + required: true + type: string + usage: + required: true + type: string + +jobs: + Get-CI-Image-Tag: + runs-on: ubuntu-latest + outputs: + ci-image-version-linux: ${{ steps.step-ci-image-version-linux.outputs.ci-image-version-linux }} + steps: + - name: Install crane + uses: iarekylew00t/crane-installer@v1 + with: + crane-release: v0.15.2 + - name: Checkout opensearch-build repository + uses: actions/checkout@v2 + with: + repository: 'opensearch-project/opensearch-build' + ref: 'main' + path: 'opensearch-build' + - name: Get ci image version from opensearch-build repository scripts + id: step-ci-image-version-linux + run: | + crane version + CI_IMAGE_VERSION=`opensearch-build/docker/ci/get-ci-images.sh -p ${{ inputs.platform }} -u ${{ inputs.usage }} -t build | head -1` + echo $CI_IMAGE_VERSION + echo "ci-image-version-linux=$CI_IMAGE_VERSION" >> $GITHUB_OUTPUT + diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index a7b0c5227..77e03345b 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -10,40 +10,23 @@ on: jobs: Get-CI-Image-Tag: - runs-on: ubuntu-latest - outputs: - ci-image-version-linux: ${{ steps.step-ci-image-version-linux.outputs.ci-image-version-linux }} - steps: - - name: Install crane - uses: iarekylew00t/crane-installer@v1 - with: - crane-release: v0.15.2 - - name: Checkout opensearch-build repository - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/opensearch-build' - ref: 'main' - path: 'opensearch-build' - - name: Get ci image version from opensearch-build repository scripts - id: step-ci-image-version-linux - run: | - crane version - CI_IMAGE_VERSION=`opensearch-build/docker/ci/get-ci-images.sh -p centos7 -u opensearch -t build | head -1` - echo $CI_IMAGE_VERSION - echo "ci-image-version-linux=$CI_IMAGE_VERSION" >> $GITHUB_OUTPUT + uses: ./.github/workflows/get-ci-image-tag.yml + with: + platform: centos7 + usage: opensearch build-linux: + needs: Get-CI-Image-Tag env: BUILD_ARGS: ${{ matrix.os_build_args }} WORKING_DIR: ${{ matrix.working_directory }}. strategy: matrix: - java: [11, 17] + java: [11] # Job name name: Build Alerting with JDK ${{ matrix.java }} on ${{ matrix.os }} # This job runs on Linux runs-on: ubuntu-latest - needs: Get-CI-Image-Tag 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 @@ -80,49 +63,49 @@ jobs: name: alerting-plugin-${{ matrix.os }} path: alerting-artifacts - build: - env: - BUILD_ARGS: ${{ matrix.os_build_args }} - WORKING_DIR: ${{ matrix.working_directory }}. - strategy: - matrix: - java: [11, 17] - os: [ windows-latest, macos-latest ] - include: - - os: windows-latest - os_build_args: -x integTest - working_directory: X:\ - os_java_options: -Xmx4096M - # Job name - name: Build Alerting with JDK ${{ matrix.java }} on ${{ matrix.os }} - # This job runs on Linux - runs-on: ${{ matrix.os }} - steps: - # This step uses the checkout Github action: https://github.com/actions/checkout - - name: Checkout Branch - uses: actions/checkout@v2 - # 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 - - name: Shorten Path - if: ${{ matrix.os == 'windows-latest' }} - run: subst 'X:' . - # This step uses the setup-java Github action: https://github.com/actions/setup-java - - name: Set Up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: Build and run with Gradle - working-directory: ${{ env.WORKING_DIR }} - run: ./gradlew assemble integTest ${{ env.BUILD_ARGS }} - env: - _JAVA_OPTIONS: ${{ matrix.os_java_options }} - - name: Create Artifact Path - run: | - mkdir -p alerting-artifacts - cp ./alerting/build/distributions/*.zip alerting-artifacts - # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact - - name: Upload Artifacts - uses: actions/upload-artifact@v1 - with: - name: alerting-plugin-${{ matrix.os }} - path: alerting-artifacts +# build: +# env: +# BUILD_ARGS: ${{ matrix.os_build_args }} +# WORKING_DIR: ${{ matrix.working_directory }}. +# strategy: +# matrix: +# java: [11, 17] +# os: [ windows-latest, macos-latest ] +# include: +# - os: windows-latest +# os_build_args: -x integTest +# working_directory: X:\ +# os_java_options: -Xmx4096M +# # Job name +# name: Build Alerting with JDK ${{ matrix.java }} on ${{ matrix.os }} +# # This job runs on Linux +# runs-on: ${{ matrix.os }} +# steps: +# # This step uses the checkout Github action: https://github.com/actions/checkout +# - name: Checkout Branch +# uses: actions/checkout@v2 +# # 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 +# - name: Shorten Path +# if: ${{ matrix.os == 'windows-latest' }} +# run: subst 'X:' . +# # This step uses the setup-java Github action: https://github.com/actions/setup-java +# - name: Set Up JDK ${{ matrix.java }} +# uses: actions/setup-java@v1 +# with: +# java-version: ${{ matrix.java }} +# - name: Build and run with Gradle +# working-directory: ${{ env.WORKING_DIR }} +# run: ./gradlew assemble integTest ${{ env.BUILD_ARGS }} +# env: +# _JAVA_OPTIONS: ${{ matrix.os_java_options }} +# - name: Create Artifact Path +# run: | +# mkdir -p alerting-artifacts +# cp ./alerting/build/distributions/*.zip alerting-artifacts +# # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact +# - name: Upload Artifacts +# uses: actions/upload-artifact@v1 +# with: +# name: alerting-plugin-${{ matrix.os }} +# path: alerting-artifacts