From aa04f048dd79a642cfde05d577fc43da0a20352c Mon Sep 17 00:00:00 2001 From: kingluo Date: Tue, 20 Sep 2022 17:26:50 +0800 Subject: [PATCH] fix PR --- .github/workflows/build.yml | 7 +++---- .github/workflows/centos7-ci.yml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d33e9a0e957d9..9c251732868f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,10 +97,6 @@ jobs: rm -rf $(ls -1 --ignore=*.tgz --ignore=ci --ignore=t --ignore=utils --ignore=.github) tar zxvf ${{ steps.branch_env.outputs.fullname }} - - name: download keycloak cas provider - run: | - sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar - - name: Start CI env (FIRST_TEST) if: steps.test_env.outputs.type == 'first' run: | @@ -110,6 +106,9 @@ jobs: - name: Start CI env (PLUGIN_TEST) if: steps.test_env.outputs.type == 'plugin' run: | + # download keycloak cas provider + sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar + sh ci/pod/openfunction/build-function-image.sh make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml sudo ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh diff --git a/.github/workflows/centos7-ci.yml b/.github/workflows/centos7-ci.yml index e0aa25cc709cc..2da72dc6b1903 100644 --- a/.github/workflows/centos7-ci.yml +++ b/.github/workflows/centos7-ci.yml @@ -93,10 +93,6 @@ jobs: docker run -itd -v /home/runner/work/apisix/apisix:/apisix --env TEST_FILE_SUB_DIR="$TEST_FILE_SUB_DIR" --name centos7Instance --net="host" --dns 8.8.8.8 --dns-search apache.org docker.io/centos:7 /bin/bash # docker exec centos7Instance bash -c "cp -r /tmp/apisix ./" - - name: download keycloak cas provider - run: | - sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar - - name: Start CI env (FIRST_TEST) if: steps.test_env.outputs.type == 'first' run: | @@ -105,6 +101,9 @@ jobs: - name: Start CI env (PLUGIN_TEST) if: steps.test_env.outputs.type == 'plugin' run: | + # download keycloak cas provider + sudo wget https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar -O /opt/keycloak-protocol-cas-18.0.2.jar + sh ci/pod/openfunction/build-function-image.sh make ci-env-up project_compose_ci=ci/pod/docker-compose.${{ steps.test_env.outputs.type }}.yml ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh