Merge pull request #166 from sunya-ch/e2e-test

add missing integration check (exclude online-trainer)

Author: rootfs

.github/workflows/integration-test.yaml

@@ -39,6 +39,20 @@ jobs:
           make cleanup
         env:
           OPTS: "ESTIMATOR"
+      - name: test deploying kepler with only server
+        run: |
+          make deploy
+          make e2e-test
+          make cleanup
+        env:
+          OPTS: "SERVER"
+      - name: test deploying kepler with estimator and model server
+        run: |
+          make deploy
+          make e2e-test
+          make cleanup
+        env:
+          OPTS: "ESTIMATOR SERVER"
       - name: test deploying dummy kepler with only estimator
         run: |
           make deploy

tests/README.md

@@ -260,13 +260,13 @@ Optional arguments:
 scenario|test cases|deploy options|status
 |---|---|---|---|
 Kepler with estimator only|Latest Kepler image is connected to estimator|ESTIMATOR|✔
-||Latest Kepler image can power from estimator||WIP
+||Estimator can load model from config|ESTIMATOR|✔
 ||Dummy power request can be made to estimator|ESTIMATOR TEST|✔
-Kepler with model server only|Latest Kepler image can request weight model from model server|SERVER|WIP
+Kepler with model server only|Latest Kepler image can request weight model from model server|SERVER|✔
 ||Dummy weight model request can be made to model server|SERVER TEST|✔
-Kepler with estimator and model server|Dummy power request can be made to estimator|ESTIMATOR SERVER TEST|✔
-||Estimator can load model from model server||✔
-||Model server can load initial model||✔
+Kepler with estimator and model server|Estimator can load model from model server|ESTIMATOR SERVER|✔
+||Model server can load initial model|ESTIMATOR SERVER|✔
+||Dummy power request can be made to estimator|ESTIMATOR SERVER TEST|✔
 Kepler with model server and online trainer|Kepler can provide metric to online trainer to train|ONLINE|WIP
 ||Dummy prometheus server can provide metric to online trainer to train|ONLINE TEST|WIP
 ||Trained model is updated to pipeline and availble on model server||WIP

tests/e2e_test.sh

@@ -97,6 +97,7 @@ test() {
     if [ ! -z ${ESTIMATOR} ]; then
         # with estimator
         if [ ! -z ${TEST} ]; then
+            # dummy kepler
             kubectl patch ds kepler-exporter -n kepler --patch-file ${top_dir}/manifests/test/power-request-client.yaml
             if [ ! -z ${SERVER} ]; then
                 restart_model_server
@@ -109,18 +110,26 @@ test() {
         fi
 
         if [ ! -z ${SERVER} ]; then
+            # with server
             wait_for_server
             wait_for_keyword estimator "load model from model server" "estimator should be able to load model from server"
+        else
+            # no server
+            wait_for_keyword estimator "load model from config" "estimator should be able to load model from config"
         fi
     else
         # no estimator
         if [ ! -z ${SERVER} ]; then
+            # with server
             if [ ! -z ${TEST} ]; then 
+                # dummy kepler
                 kubectl patch ds kepler-exporter -n kepler --patch-file ${top_dir}/manifests/test/model-request-client.yaml
                 restart_model_server
                 sleep 1
                 wait_for_kepler
                 wait_for_keyword kepler Done "cannot get model weight"
+            else
+                wait_for_keyword kepler "getWeightFromServer.*core" "kepler should get weight from server"
             fi
         fi
     fi