This is an automated email from the ASF dual-hosted git repository.

pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 24391a0  SUBMARINE-970. Simplify integration tests' workflow
24391a0 is described below

commit 24391a0e225ab80297f89f2c634afe1f4daaa302
Author: KUAN-HSUN-LI <[email protected]>
AuthorDate: Fri Aug 13 13:46:24 2021 +0800

    SUBMARINE-970. Simplify integration tests' workflow
    
    ### What is this PR for?
    * These two PRs fix the GitHub Actions cache errors
    https://github.com/apache/submarine/pull/695/files
    https://github.com/apache/submarine/pull/683/files
    * This PR install the package in test-k8s for creating the latest test 
cases but it wastes time compiling the project twice
    https://github.com/apache/submarine/pull/702/files
    * In this PR,  simplify the integration tests' workflow
      * Delete the `build submarine` job, and move the building submarine into 
the integration test jobs
    
    ### What type of PR is it?
    [Improvement]
    
    ### Todos
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-970
    
    ### How should this be tested?
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Do the license files need updating? No
    * Are there breaking changes for older versions? No
    * Does this need new documentation? No
    
    Author: KUAN-HSUN-LI <[email protected]>
    
    Signed-off-by: Kevin <[email protected]>
    
    Closes #708 from KUAN-HSUN-LI/SUBMARINE-970 and squashes the following 
commits:
    
    d5d70f7b [KUAN-HSUN-LI] SUBMARINE-970. Delete duplicate mvn install
    002b90a4 [KUAN-HSUN-LI] SUBMARINE-970. simplify the integration tests' 
workflow
---
 .github/workflows/master.yml | 64 +++++---------------------------------------
 1 file changed, 6 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index e8e2344..0cc7147 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -26,47 +26,9 @@ env:
   TEST_FLAG: "test -DskipRat -ntp"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - name: Set up Maven 3.6.3
-        uses: stCarolas/setup-maven@v4
-        with:
-          maven-version: 3.6.3
-      - name: Check version
-        run: |
-          mvn --version
-          java -version
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Build with Maven
-        run: |
-          echo ">>> mvn ${BUILD_FLAG} ${PROFILE} -B"
-          mvn ${BUILD_FLAG} ${PROFILE} -B
-      - name: Store build binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: submarine-bin
-          path: submarine-dist/target/submarine-dist*.tar.gz
-      - name: Delete temporary build artifacts before caching
-        run: |
-          #Never cache local artifacts
-          rm -rf ~/.m2/repository/org/apache/submarine
-        if: always()
   submarine-e2e:
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    needs: [build]
     services:
       mysql:
         image: mysql:5.7
@@ -98,16 +60,10 @@ jobs:
         run: |
           pip install mysql-connector-python
           python3 ./dev-support/database/init-database.py
-      - name: Download compiled Submarine binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: submarine-bin
-      - name: Untar binaries
+      - name: Build with Maven
         run: |
-          mkdir -p 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
-          tar zxvf submarine-dist*.tar.gz -C 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
-          mv submarine-dist*.tar.gz submarine-dist/target/
-          sudo chmod -R a+rwX 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
+          echo ">>> mvn ${BUILD_FLAG} ${PROFILE} -B"
+          mvn ${BUILD_FLAG} ${PROFILE} -B
       - name: Test
         env:
           TEST_FLAG: "verify -DskipRat -ntp"
@@ -118,7 +74,6 @@ jobs:
   submarine-k8s:
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    needs: [build]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -152,16 +107,10 @@ jobs:
           kubectl get pods -n kube-system
           echo "current-context:" $(kubectl config current-context)
           echo "environment-kubeconfig:" ${KUBECONFIG}
-      - name: Download compiled Submarine binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: submarine-bin
-      - name: Untar binaries
+      - name: Build with Maven
         run: |
-          mkdir -p 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
-          tar zxvf submarine-dist*.tar.gz -C 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
-          mv submarine-dist*.tar.gz submarine-dist/target/
-          sudo chmod -R a+rwX 
submarine-dist/target/submarine-dist-${VERSION}-hadoop-${HADOOP_VERSION}
+          echo ">>> mvn ${BUILD_FLAG} ${PROFILE} -B"
+          mvn ${BUILD_FLAG} ${PROFILE} -B
       - name: Build Image locally
         run: .github/scripts/build-image-locally.sh
       - name: Start submarine
@@ -172,7 +121,6 @@ jobs:
           TEST_MODULES: "-pl :submarine-test-k8s"
         run: |
           echo ">>> mvn ${TEST_FLAG} ${TEST_MODULES} ${PROFILE} -B"
-          mvn install -DskipTests
           mvn ${TEST_FLAG} ${TEST_MODULES} ${PROFILE} -B
       - name: Failure status
         run: |

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to