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

cdmikechen 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 5a5e3a65 SUBMARINE-1396. Split experiment-prehandler test into 
separate action
5a5e3a65 is described below

commit 5a5e3a652087d389766875b09eb1ffe70eb03823
Author: cdmikechen <[email protected]>
AuthorDate: Sat Jul 29 20:40:40 2023 +0800

    SUBMARINE-1396. Split experiment-prehandler test into separate action
    
    ### What is this PR for?
    The image build of `experiment-prehandler` resulted in a `no space left on 
device` exception. Now split `experiment-prehandler` build to a standalone 
script.
    Currently, the e2e test already contains `experiment-prehandler` experiment 
related codes (a new issue has been created to handle unit test 
https://issues.apache.org/jira/browse/SUBMARINE-1397), so for now remove pyhton 
test.
    
    ### What type of PR is it?
    Hot Fix
    
    ### Todos
    * [x] - Strip experiment-prehandler from python tests
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-1396
    
    ### How should this be tested?
    CI test
    
    ### Screenshots (if appropriate)
    NA
    
    ### Questions:
    * Do the license files need updating? No
    * Are there breaking changes for older versions? No
    * Does this need new documentation? No
    
    Author: cdmikechen <[email protected]>
    Author: cdmikechen <[email protected]>
    
    Signed-off-by: cdmikechen <[email protected]>
    
    Closes #1093 from cdmikechen/SUBMARINE-1396 and squashes the following 
commits:
    
    31f058df [cdmikechen] use sh
    9ef4ad09 [cdmikechen] remove space
    bc96ee1a [cdmikechen] add new scripts
    5f99e471 [cdmikechen]  Remove experiment-prehandler in build image scripts
---
 ...lly.sh => build-image-experiment-prehandler.sh} | 23 +++++-----------------
 .github/scripts/build-image-locally-v3.sh          |  3 +--
 .github/scripts/build-image-locally.sh             |  3 +--
 .github/workflows/master.yml                       |  8 ++++++--
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.github/scripts/build-image-locally.sh 
b/.github/scripts/build-image-experiment-prehandler.sh
old mode 100755
new mode 100644
similarity index 55%
copy from .github/scripts/build-image-locally.sh
copy to .github/scripts/build-image-experiment-prehandler.sh
index 4d35d690..a3b37e35
--- a/.github/scripts/build-image-locally.sh
+++ b/.github/scripts/build-image-experiment-prehandler.sh
@@ -17,21 +17,8 @@
 #
 
 SUBMARINE_VERSION="0.8.0-SNAPSHOT"
-FOLDER_LIST=("database" "mlflow" "submarine" "operator" "agent" 
"experiment-prehandler")
-IMAGE_LIST=(
-  "apache/submarine:database-${SUBMARINE_VERSION}"
-  "apache/submarine:mlflow-${SUBMARINE_VERSION}"
-  "apache/submarine:server-${SUBMARINE_VERSION}"
-  "apache/submarine:operator-${SUBMARINE_VERSION}"
-  "apache/submarine:agent-${SUBMARINE_VERSION}"
-  "apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}"
-)
-
-for i in "${!IMAGE_LIST[@]}"
-do
-  echo "Build Image ${IMAGE_LIST[i]}"
-  echo "Execute ./dev-support/docker-images/${FOLDER_LIST[i]}/build.sh"
-  ./dev-support/docker-images/"${FOLDER_LIST[i]}"/build.sh
-  kind load docker-image "${IMAGE_LIST[i]}"
-done
-
+echo "Build Image apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}"
+echo "Execute ./dev-support/docker-images/experiment-prehandler/build.sh"
+./dev-support/docker-images/experiment-prehandler/build.sh
+kind load docker-image 
apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}
+docker rmi apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}
\ No newline at end of file
diff --git a/.github/scripts/build-image-locally-v3.sh 
b/.github/scripts/build-image-locally-v3.sh
index e8525469..13f2c1de 100755
--- a/.github/scripts/build-image-locally-v3.sh
+++ b/.github/scripts/build-image-locally-v3.sh
@@ -17,14 +17,13 @@
 #
 
 SUBMARINE_VERSION="0.8.0-SNAPSHOT"
-FOLDER_LIST=("database" "mlflow" "submarine" "operator-v3" "agent" 
"experiment-prehandler")
+FOLDER_LIST=("database" "mlflow" "submarine" "operator-v3" "agent")
 IMAGE_LIST=(
   "apache/submarine:database-${SUBMARINE_VERSION}"
   "apache/submarine:mlflow-${SUBMARINE_VERSION}"
   "apache/submarine:server-${SUBMARINE_VERSION}"
   "apache/submarine:operator-${SUBMARINE_VERSION}"
   "apache/submarine:agent-${SUBMARINE_VERSION}"
-  "apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}"
 )
 
 for i in "${!IMAGE_LIST[@]}"
diff --git a/.github/scripts/build-image-locally.sh 
b/.github/scripts/build-image-locally.sh
index 4d35d690..4619ee20 100755
--- a/.github/scripts/build-image-locally.sh
+++ b/.github/scripts/build-image-locally.sh
@@ -17,14 +17,13 @@
 #
 
 SUBMARINE_VERSION="0.8.0-SNAPSHOT"
-FOLDER_LIST=("database" "mlflow" "submarine" "operator" "agent" 
"experiment-prehandler")
+FOLDER_LIST=("database" "mlflow" "submarine" "operator" "agent")
 IMAGE_LIST=(
   "apache/submarine:database-${SUBMARINE_VERSION}"
   "apache/submarine:mlflow-${SUBMARINE_VERSION}"
   "apache/submarine:server-${SUBMARINE_VERSION}"
   "apache/submarine:operator-${SUBMARINE_VERSION}"
   "apache/submarine:agent-${SUBMARINE_VERSION}"
-  "apache/submarine:experiment-prehandler-${SUBMARINE_VERSION}"
 )
 
 for i in "${!IMAGE_LIST[@]}"
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 2f6ff79f..9a34327d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -114,7 +114,9 @@ jobs:
           echo "current-context:" $(kubectl config current-context)
           echo "environment-kubeconfig:" ${KUBECONFIG}
       - name: Build Image locally
-        run: .github/scripts/build-image-locally-v3.sh
+        run: |
+          .github/scripts/build-image-locally-v3.sh
+          sh .github/scripts/build-image-experiment-prehandler.sh
       - name: Install Golang Dependencies
         working-directory: submarine-cloud-v3
         run: go mod vendor
@@ -260,7 +262,9 @@ jobs:
           echo ">>> mvn ${BUILD_FLAG} -B"
           mvn ${BUILD_FLAG} -B
       - name: Build Image locally
-        run: .github/scripts/build-image-locally-v3.sh
+        run: |
+          .github/scripts/build-image-locally-v3.sh
+          sh .github/scripts/build-image-experiment-prehandler.sh
       - name: Start submarine
         run: bash ./.github/scripts/start-submarine.sh
       - name: Test


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

Reply via email to