[PR2]Ensure Github workflow runs on docker image used by Production D…

…istribution Build (opensearch-project#1264) * Update get image workflow to use the yml from opensearch-build repo Signed-off-by: Peter Zhu <[email protected]> * Update more Signed-off-by: Peter Zhu <[email protected]> * Remove usages Signed-off-by: Peter Zhu <[email protected]> * Add more Signed-off-by: Peter Zhu <[email protected]> * Restore security test to original as it is not good to run dind for docker Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
peterzhuamazon · Oct 13, 2023 · b195c59 · b195c59
1 parent 36d81e4
commit b195c59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 65 deletions.
diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml
diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
@@ -10,10 +10,9 @@ on:
 
 jobs:
   Get-CI-Image-Tag:
-    uses: ./.github/workflows/get-ci-image-tag.yml
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
     with:
-      platform: centos7
-      usage: opensearch
+      product: opensearch
 
   build-linux:
     needs: Get-CI-Image-Tag

diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml
@@ -9,29 +9,20 @@ on:
       - "*"
 
 jobs:
-  Get-CI-Image-Tag:
-    uses: ./.github/workflows/get-ci-image-tag.yml
-    with:
-      platform: centos7
-      usage: opensearch
-
-  build-linux:
-    needs: Get-CI-Image-Tag
+  build:
     strategy:
       matrix:
         java: [ 11, 17 ]
     # Job name
     name: Build and test Alerting
     # This job runs on Linux
     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:
+      # 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 }}
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch
         uses: actions/checkout@v2
@@ -42,9 +33,7 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Build Alerting
         # Only assembling since the full build is governed by other workflows
-        run: |
-          chown -R opensearch.opensearch `pwd`
-          su opensearch -c "whoami && java -version && ./gradlew assemble"
+        run: ./gradlew assemble
       - name: Pull and Run Docker
         run: |
           plugin=`basename $(ls alerting/build/distributions/*.zip)`
@@ -97,8 +86,7 @@ jobs:
           if [ $security -gt 0 ]
           then
             echo "Security plugin is available"
-            chown -R opensearch.opensearch `pwd`
-            su opensearch -c "whoami && java -version && ./gradlew :alerting:integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin"
+            ./gradlew :alerting:integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin
           else
             echo "Security plugin is NOT available skipping this run as tests without security have already been run"
           fi
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
@@ -10,10 +10,9 @@ on:
 
 jobs:
   Get-CI-Image-Tag:
-    uses: ./.github/workflows/get-ci-image-tag.yml
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
     with:
-      platform: centos7
-      usage: opensearch
+      product: opensearch
 
   build-linux:
     needs: Get-CI-Image-Tag