From 1111f8985dadfef9ca1221ace3706bd9c1e57c7d Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Sun, 4 Aug 2024 16:13:08 +0800 Subject: [PATCH] Bump up infra-e2e GHA (#12506) --- .github/workflows/skywalking.yaml | 9 ++++----- docs/en/changes/changes.md | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 42e97bbb0c..fe95530c6c 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -686,7 +686,7 @@ jobs: env: OPENSEARCH_VERSION=2.4.0 - name: OTLP Trace - config: test/e2e-v2/cases/otlp-traces/e2e.yaml + config: test/e2e-v2/cases/otlp-traces/e2e.yaml - name: Cilium Service config: test/e2e-v2/cases/cilium/e2e.yaml @@ -725,7 +725,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@7f6b0da20f170b181a79cf89ef7d47848ac34138 + uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180 with: e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} - if: ${{ failure() }} @@ -782,7 +782,7 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{ matrix.test.name }} - uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e + uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180 env: ISTIO_VERSION: ${{ matrix.versions.istio }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} @@ -840,7 +840,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@0a5b398fc9668ccb848b16e6da4f09180955dc3e + uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180 env: SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} with: @@ -886,4 +886,3 @@ jobs: [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8; exit 0; - diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index f1ffad1f2d..43402c4a01 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -4,6 +4,7 @@ * E2E: bump up the version of the opentelemetry-collector to 0.102.1. * Push snapshot data-generator docker image to ghcr.io. +* Bump up skywalking-infra-e2e to work around GHA removing `docker-compose` v1. #### OAP Server