fix issues (intel-analytics#5539)

ForJadeForest · Sep 20, 2022 · f17f3dd · f17f3dd
1 parent 756bb0a
commit f17f3dd
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 44 deletions.
diff --git a/.github/actions/dllib-scala-ut-action/action.yml b/.github/actions/dllib-scala-ut-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Run tests
+      shell: bash
       run: |
         export SPARK_LOCAL_HOSTNAME=localhost
         export KERAS_BACKEND=tensorflow

diff --git a/.github/actions/friesian-scala-ut-action/action.yml b/.github/actions/friesian-scala-ut-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up redis
+      shell: bash
       run: |
           sudo mkdir -p /usr/share/keyrings
           curl -fsSL https://packages.redis.io/gpg | sudo -E gpg --yes --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
@@ -14,6 +15,7 @@ runs:
           redis-cli ping
 
     - name: Set up mkl
+      shell: bash
       run: |
         cd /tmp
         curl -O http://10.239.45.10:8081/repository/raw/analytics-zoo-data/faiss-lib.zip
@@ -23,13 +25,15 @@ runs:
         sudo ln -fs /lib/libmkl_intel_lp64.so /lib/libmkl_intel_lp64.so.2
 
     - name: Prepare data
+      shell: bash
       run: |
         mkdir -p /tmp/friesian-unittest
         cd /tmp/friesian-unittest
         curl -O http://10.239.45.10:8081/repository/raw/analytics-zoo-data/friesian-serving-upload.tar.gz 
         tar -zxf friesian-serving-upload.tar.gz
 
     - name: Run tests
+      shell: bash
       run: |
         export SPARK_LOCAL_HOSTNAME=localhost
         export KERAS_BACKEND=tensorflow

diff --git a/.github/actions/orca-jep-exampletest-action/action.yml b/.github/actions/orca-jep-exampletest-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Env
+      shell: bash
       run: |
         apt-get update
         apt-get install wget
@@ -12,6 +13,7 @@ runs:
       with:
         python-version: '3.7'
     - name: Install dependencies
+      shell: bash
       run: |
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools==58.0.4
@@ -21,8 +23,8 @@ runs:
         pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r python/orca/dev/example/requirements-jep.txt
         pip uninstall -y opencv-python-headless
         pip install opencv-python-headless
-
     - name: Run Test
+      shell: bash
       run: |
         export SPARK_LOCAL_HOSTNAME=localhost
         chmod a+x python/orca/dev/example/run-example-tests-jep.sh

diff --git a/.github/actions/orca-python-exampletest-action/action.yml b/.github/actions/orca-python-exampletest-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Env
+      shell: bash
       run: |
         apt-get update
         apt-get install wget
@@ -14,6 +15,7 @@ runs:
         python-version: '3.7.6'
 
     - name: Install dependencies
+      shell: bash
       run: |
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools==58.0.4
@@ -24,6 +26,7 @@ runs:
         pip uninstall -y opencv-python-headless
         pip install opencv-python-headless
     - name: Run Test
+      shell: bash
       run: |
         export MAVEN_OPTS="-XX:MaxPermSize=3G -Xmx100G -XX:ReservedCodeCacheSize=512m"
         export _JAVA_OPTIONS="-Xmx100G -XX:MaxPermSize=3G"

diff --git a/.github/actions/orca-python-exampletest-ray-action/action.yml b/.github/actions/orca-python-exampletest-ray-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Env
+      shell: bash
       run: |
         apt-get update
         apt-get install wget
@@ -14,6 +15,7 @@ runs:
         python-version: '3.7'
 
     - name: Install dependencies
+      shell: bash
       run: |
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools==58.0.4
@@ -25,6 +27,7 @@ runs:
         pip install opencv-python-headless
 
     - name: Run Test
+      shell: bash
       run: |
         export SPARK_LOCAL_HOSTNAME=localhost
         chmod a+x python/orca/dev/example/run-example-test-ray.sh

diff --git a/.github/actions/ppml-scala-ut-action/action.yml b/.github/actions/ppml-scala-ut-action/action.yml
@@ -4,6 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Run tests
+      shell: bash
       run: |
         export SPARK_LOCAL_HOSTNAME=localhost
         export KERAS_BACKEND=tensorflow

diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml
@@ -67,7 +67,7 @@ jobs:
 
 
   bigdl-ppml-trusted-big-data-ml-python-graphene:
-    if: ${{ github.event.inputs.artifact == 'docker-bigdl-ppml-trusted-big-data-ml-python-graphene' || github.event.inputs.artifact == 'all' }}
+    if: ${{ github.event.inputs.artifact == 'bigdl-ppml-trusted-big-data-ml-python-graphene' || github.event.inputs.artifact == 'all' }}
     runs-on: [self-hosted, Shire]
 
     steps:

diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
@@ -205,48 +205,6 @@ jobs:
         docker push 10.239.45.10/arda/${IMAGE}-spark-3.1.2:${TAG}
         docker rmi -f ${IMAGE}-spark-3.1.2:${TAG}
   
-
-    needs: scala-build
-    if: ${{ github.event.schedule == '0 12 * * 1' || github.event.inputs.artifact == 'docker-kms' || github.event.inputs.artifact == 'all' }}
-    runs-on: [self-hosted, Shire]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set the variable
-      env:
-        DEFAULT_TAG: '0.3.0'
-      run: echo "TAG=${{ github.event.inputs.kmsTag || env.DEFAULT_TAG }}" >> $GITHUB_ENV
-    - name: docker deploy kms-util
-      run: |
-        export IMAGE=intelanalytics/kms-utils
-        cd ppml/services/kms-utils/docker
-        echo "########################################"
-        echo "############## kms-utils ###############"
-        echo "########################################"
-        docker build \
-          --no-cache=true \
-          --build-arg http_proxy=${HTTP_PROXY} \
-          --build-arg https_proxy=${HTTPS_PROXY} \
-          --build-arg JDK_URL=${JDK_URL} \
-          -t $IMAGE:$TAG -f ./Dockerfile .
-        docker tag ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG}
-        docker push 10.239.45.10/arda/${IMAGE}:${TAG}
-        docker rmi -f ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG}
-    - name: docker deploy pccs
-      run: |
-        export IMAGE=intelanalytics/pccs
-        cd ppml/services/pccs/docker
-        echo "########################################"
-        echo "################# PCCS #################"
-        echo "########################################"
-        docker build \
-          --no-cache=true \
-          --build-arg http_proxy=${HTTP_PROXY} \
-          --build-arg https_proxy=${HTTPS_PROXY} \
-          -t $IMAGE:$TAG -f ./Dockerfile .
-        docker tag ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG}
-        docker push 10.239.45.10/arda/${IMAGE}:${TAG}
-        docker rmi -f ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG}
 
   python-build:
     if: ${{ github.event.schedule || github.event.inputs.artifact == 'python-build' || github.event.inputs.artifact == 'all' }}