From cb7589708523792683bce9799d022e0216073dc7 Mon Sep 17 00:00:00 2001 From: "Hui, Chunyang" Date: Mon, 18 Sep 2023 09:31:00 +0000 Subject: [PATCH] Refine log output for demo test CI --- .github/workflows/demo_test.yml | 30 +++++++++++++++++++++++------- src/libos/Cargo.lock | 28 ++++++++++++++-------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.github/workflows/demo_test.yml b/.github/workflows/demo_test.yml index 607e47f1..91e9b0f7 100644 --- a/.github/workflows/demo_test.yml +++ b/.github/workflows/demo_test.yml @@ -413,11 +413,15 @@ jobs: run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/pytorch/distributed; SGX_MODE=SIM ./build_pytorch_occlum_instance.sh" - name: Start pytorch Occlum instance node one - run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/pytorch/distributed/occlum_instance; WORLD_SIZE=2 RANK=0 occlum run /bin/python3 mnist.py --epoch 3 --no-cuda --seed 42 --save-model &" + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/pytorch/distributed/occlum_instance; WORLD_SIZE=2 RANK=0 occlum run /bin/python3 mnist.py --epoch 3 --no-cuda --seed 42 --save-model > pytorch_1.log 2>&1 &" - name: Start pytorch Occlum instance node two run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/pytorch/distributed/occlum_instance_2; WORLD_SIZE=2 RANK=1 occlum run /bin/python3 mnist.py --epoch 3 --no-cuda --seed 42 --save-model" - + + - name: Check error log + if: ${{ always() }} + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/pytorch/distributed/occlum_instance; cat pytorch_1.log" + - name: Clean distributed Pytorch test run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos && rm -rf ./pytorch/distributed" @@ -748,7 +752,7 @@ jobs: run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/flink && SGX_MODE=SIM ./run_flink_jobmanager_on_host.sh" - name: Run flink taskmanager - run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/flink && SGX_MODE=SIM ./run_flink_on_occlum_glibc.sh tm" + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/flink && SGX_MODE=SIM ./run_flink_on_occlum_glibc.sh tm > flink.log 2>&1 &" - name: Run flink task run: | @@ -759,6 +763,10 @@ jobs: if: ${{ always() }} run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/flink; cat occlum_instance_taskmanager/flink--taskmanager-0.log" + - name: Check error log + if: ${{ always() }} + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/flink; cat flink.log" + - name: Clean Flink test run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos && rm -rf ./flink" @@ -847,13 +855,17 @@ jobs: run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/vault && ./prepare_vault.sh" - name: Run the Vault server on Occlum - run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/vault && SGX_MODE=SIM ./run_occlum_vault_server.sh" + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/vault && SGX_MODE=SIM ./run_occlum_vault_server.sh > vault.log 2>&1 &" - name: Run the Vault client run: | sleep ${{ env.nap_time }}; docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/vault && ./run_occlum_vault_test.sh" - + + - name: Check error log + if: ${{ always() }} + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/golang/vault; cat vault.log" + - name: Clean Vault test run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos && rm -rf ./golang/vault" @@ -883,13 +895,17 @@ jobs: run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/sofaboot && ./download_compile_sofaboot.sh" - name: Run SOFABoot web demo - run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/sofaboot && SGX_MODE=SIM ./run_sofaboot_on_occlum.sh" + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/sofaboot && SGX_MODE=SIM ./run_sofaboot_on_occlum.sh > sofa.log 2>&1 &" - name: Check SOFABoot result run: | sleep ${{ env.nap_time }}; docker exec ${{ github.job }} bash -c "curl -s http://localhost:8080/actuator/readiness | grep -v DOWN" - + + - name: Check error log + if: ${{ always() }} + run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos/sofaboot; cat sofa.log" + - name: Clean Sofaboot test run: docker exec ${{ github.job }} bash -c "cd /root/occlum/demos && rm -rf ./sofaboot" diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock index 566f3635..d370c738 100644 --- a/src/libos/Cargo.lock +++ b/src/libos/Cargo.lock @@ -592,11 +592,11 @@ dependencies = [ [[package]] name = "sgx_alloc" -version = "1.1.5" +version = "1.1.6" [[package]] name = "sgx_backtrace_sys" -version = "1.1.5" +version = "1.1.6" dependencies = [ "cc", "sgx_build_helper", @@ -605,11 +605,11 @@ dependencies = [ [[package]] name = "sgx_build_helper" -version = "1.1.5" +version = "1.1.6" [[package]] name = "sgx_cov" -version = "1.1.5" +version = "1.1.6" dependencies = [ "lazy_static", "profiler_builtins", @@ -621,18 +621,18 @@ dependencies = [ [[package]] name = "sgx_demangle" -version = "1.1.5" +version = "1.1.6" [[package]] name = "sgx_libc" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_types", ] [[package]] name = "sgx_rand" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_trts", "sgx_tstd", @@ -641,14 +641,14 @@ dependencies = [ [[package]] name = "sgx_tcrypto" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_types", ] [[package]] name = "sgx_tprotected_fs" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_trts", "sgx_types", @@ -656,7 +656,7 @@ dependencies = [ [[package]] name = "sgx_trts" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_libc", "sgx_types", @@ -664,14 +664,14 @@ dependencies = [ [[package]] name = "sgx_tse" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_types", ] [[package]] name = "sgx_tstd" -version = "1.1.5" +version = "1.1.6" dependencies = [ "hashbrown_tstd", "sgx_alloc", @@ -686,11 +686,11 @@ dependencies = [ [[package]] name = "sgx_types" -version = "1.1.5" +version = "1.1.6" [[package]] name = "sgx_unwind" -version = "1.1.5" +version = "1.1.6" dependencies = [ "sgx_build_helper", ]