This is an automated email from the ASF dual-hosted git repository. liuhongyu pushed a commit to branch fix/fix_ci in repository https://gitbox.apache.org/repos/asf/shenyu.git
commit e289a5273c5df4e5e43274ae18cb672d4c69d097 Author: liuhy <[email protected]> AuthorDate: Tue Apr 8 09:43:19 2025 +0800 [fix] fix ci --- .github/workflows/e2e-k8s.yml | 16 +++++++------- .github/workflows/integrated-test-k8s-ingress.yml | 26 +++++++++++------------ .github/workflows/integrated-test.yml | 18 ++++++++-------- .github/workflows/k8s-examples-http.yml | 16 +++++++------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml index ee615a9c0b..031b977bd7 100644 --- a/.github/workflows/e2e-k8s.yml +++ b/.github/workflows/e2e-k8s.yml @@ -47,7 +47,7 @@ jobs: build-docker-images: needs: changes - if: ${{ needs.changes.outputs.e2e == 'true' }} +# if: ${{ needs.changes.outputs.e2e == 'true' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -107,7 +107,7 @@ jobs: needs: - changes - build-docker-images - if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }}) +# if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }}) strategy: matrix: include: @@ -157,7 +157,7 @@ jobs: distribution: 'temurin' - name: Restore ShenYu Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache/restore@v3 with: path: ~/.m2/repository @@ -183,7 +183,7 @@ jobs: # sudo k3s ctr images import /tmp/shenyu/apache-shenyu-bootstrap.tar - name: Run E2E Tests - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | bash ./shenyu-e2e/shenyu-e2e-case/${{ matrix.case }}/compose/script/${{ matrix.script }}.sh @@ -198,7 +198,7 @@ jobs: needs: - changes - build-docker-images - if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }}) +# if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }}) strategy: matrix: include: @@ -261,7 +261,7 @@ jobs: distribution: 'temurin' - name: Restore ShenYu Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache/restore@v3 with: path: ~/.m2/repository @@ -309,7 +309,7 @@ jobs: # detached: true - name: Run E2E Tests - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | bash ./shenyu-e2e/shenyu-e2e-case/${{ matrix.case }}/compose/script/${{ matrix.script }}.sh @@ -321,7 +321,7 @@ jobs: requirement: name: e2e - if: ${{ needs.changes.outputs.e2e == 'true' }} +# if: ${{ needs.changes.outputs.e2e == 'true' }} needs: - changes - e2e-storage diff --git a/.github/workflows/integrated-test-k8s-ingress.yml b/.github/workflows/integrated-test-k8s-ingress.yml index 0779a80bcd..848f939f66 100644 --- a/.github/workflows/integrated-test-k8s-ingress.yml +++ b/.github/workflows/integrated-test-k8s-ingress.yml @@ -46,7 +46,7 @@ jobs: # list-files: json - name: Clean Space - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | sudo rm -rf /usr/share/dotnet sudo rm -rf /opt/ghc @@ -54,7 +54,7 @@ jobs: sudo rm -rf "$AGENT_TOOLSDIRECTORY" - name: Cache Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache@v3 with: path: ~/.m2/repository @@ -63,7 +63,7 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v4 - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' with: java-version: 17 distribution: 'temurin' @@ -74,14 +74,14 @@ jobs: go-version: 1.17.x - name: Install k8s - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | go install sigs.k8s.io/[email protected] curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.14/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl kind create cluster --image=kindest/node:v1.21.1 --config=./shenyu-integrated-test/${{ matrix.case }}/deploy/kind-config.yaml - name: Cache Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache@v3 with: path: ~/.m2/repository @@ -90,41 +90,41 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v4 - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' with: java-version: 17 distribution: 'temurin' - name: Build with Maven - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true - name: Build integrated tests - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Pit -DskipTests -am -f ./shenyu-integrated-test/pom.xml - name: Build examples - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml - name: Build k8s Cluster - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: bash ./shenyu-integrated-test/${{ matrix.case }}/script/build_k8s_cluster.sh - name: Wait for k8s Cluster Start up - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' timeout-minutes: 15 run: | bash ./shenyu-integrated-test/${{ matrix.case }}/script/healthcheck.sh - name: Run test id: test - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw test -Pit -f ./shenyu-integrated-test/${{ matrix.case }}/pom.xml continue-on-error: true - name: Cluster Test after Healthcheck - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | echo "----------kubectl get all -o wide----------" kubectl get all -o wide diff --git a/.github/workflows/integrated-test.yml b/.github/workflows/integrated-test.yml index aca67ca5a9..dcc039a486 100644 --- a/.github/workflows/integrated-test.yml +++ b/.github/workflows/integrated-test.yml @@ -61,7 +61,7 @@ jobs: # filters: '.github/filters.yml' # list-files: json - name: Restore ShenYu Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache/restore@v3 with: path: ~/.m2/repository @@ -69,35 +69,35 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - uses: actions/setup-java@v4 - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' with: java-version: 17 distribution: 'temurin' - name: Build with Maven - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Prelease,docker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true - name: Build examples - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -am -f ./shenyu-examples/pom.xml - name: Build integrated tests - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Pit -DskipTests -f ./shenyu-integrated-test/pom.xml - name: Start docker compose - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: docker compose -f ./shenyu-integrated-test/${{ matrix.case }}/docker-compose.yml up -d - name: Wait for docker compose start up completely - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: bash ./shenyu-integrated-test/${{ matrix.case }}/script/healthcheck.sh - name: Disk space info run: | df --human-readable - name: Run test id: test - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw test -Pit -f ./shenyu-integrated-test/${{ matrix.case }}/pom.xml continue-on-error: true - name: Check test result - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | docker compose -f ./shenyu-integrated-test/${{ matrix.case }}/docker-compose.yml logs --tail="all" if [[ ${{steps.test.outcome}} == "failure" ]]; then diff --git a/.github/workflows/k8s-examples-http.yml b/.github/workflows/k8s-examples-http.yml index 9c1e67374a..f916f6089d 100644 --- a/.github/workflows/k8s-examples-http.yml +++ b/.github/workflows/k8s-examples-http.yml @@ -47,7 +47,7 @@ jobs: # list-files: json - name: Install k8s - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.29.6+k3s2 K3S_KUBECONFIG_MODE=777 sh - cat /etc/rancher/k3s/k3s.yaml @@ -55,7 +55,7 @@ jobs: cp /etc/rancher/k3s/k3s.yaml ~/.kube/config - name: Restore ShenYu Maven Repos - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' uses: actions/cache/restore@v3 with: path: ~/.m2/repository @@ -64,21 +64,21 @@ jobs: ${{ runner.os }}-maven- - uses: actions/setup-java@v4 - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' with: java-version: 17 distribution: 'temurin' - name: Build with Maven - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Prelease,docker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true - name: Build examples - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -f ./shenyu-examples/pom.xml - name: Build k8s Cluster - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | docker save apache/shenyu-admin:latest apache/shenyu-bootstrap:latest shenyu-examples-http:latest | sudo k3s ctr images import - kubectl apply -f ./shenyu-examples/shenyu-examples-http/k8s/shenyu-deployment.yml @@ -87,12 +87,12 @@ jobs: kubectl apply -f ./shenyu-examples/shenyu-examples-http/k8s/shenyu-examples-http.yml - name: Wait for k8s Cluster Start up - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | bash ./shenyu-examples/shenyu-examples-http/k8s/script/healthcheck.sh - name: Cluster Test after Healthcheck - if: steps.filter.outputs.changed == 'true' +# if: steps.filter.outputs.changed == 'true' run: | kubectl get all kubectl get events --all-namespaces
