This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch fix/update-infra-e2e-distinct-contains in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 3bc9e5c37492d84aa8043b12717a2a495a6cbe41 Author: Wu Sheng <[email protected]> AuthorDate: Mon Apr 13 07:17:35 2026 +0800 Update infra-e2e to b2a6639 and fix duplicate expected entry Bump skywalking-infra-e2e to b2a6639 which enforces distinct matching in `contains` (each actual item can only satisfy one expected entry). Remove duplicate `ratings.default` entry in rover/istio service expected file that would fail with the new distinct matching behavior. --- .github/workflows/skywalking.yaml | 10 +++++----- test/e2e-v2/cases/rover/process/istio/expected/service.yml | 10 ---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 833b1c8863..5ac17576ec 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -769,7 +769,7 @@ jobs: if: matrix.test.docker != null run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae + uses: apache/skywalking-infra-e2e@b2a6639541b562fb0eff89b32b28c5f367023db6 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} @@ -843,7 +843,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ALS ${{ matrix.storage }}, ${{ matrix.analyzer }}, istio-${{ matrix.versions.istio }}, k8s-${{ matrix.versions.kubernetes }} - uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae + uses: apache/skywalking-infra-e2e@b2a6639541b562fb0eff89b32b28c5f367023db6 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -915,7 +915,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae + uses: apache/skywalking-infra-e2e@b2a6639541b562fb0eff89b32b28c5f367023db6 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -979,7 +979,7 @@ jobs: shell: bash run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package - name: Java version ${{ matrix.java-version }} - uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae + uses: apache/skywalking-infra-e2e@b2a6639541b562fb0eff89b32b28c5f367023db6 env: SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} with: @@ -1075,7 +1075,7 @@ jobs: fi docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae + uses: apache/skywalking-infra-e2e@b2a6639541b562fb0eff89b32b28c5f367023db6 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} diff --git a/test/e2e-v2/cases/rover/process/istio/expected/service.yml b/test/e2e-v2/cases/rover/process/istio/expected/service.yml index d4d677934e..ee36888882 100644 --- a/test/e2e-v2/cases/rover/process/istio/expected/service.yml +++ b/test/e2e-v2/cases/rover/process/istio/expected/service.yml @@ -51,16 +51,6 @@ - MESH {{- end }} normal: true -- id: {{ b64enc "ratings.default" }}.1 - name: ratings.default - group: "" - shortname: ratings.default - layers: - {{- contains .layers }} - - MESH_DP - - MESH - {{- end }} - normal: true - id: {{ b64enc "istio-egressgateway.istio-system" }}.1 name: istio-egressgateway.istio-system group: ""
