kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump up infra-e2e GHA (#12506)

This commit is contained in:
kezhenxu94 2024-08-04 16:13:08 +08:00 committed by GitHub
parent 7727ef5b7c
commit 1111f8985d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/skywalking.yaml vendored
View File

@ -686,7 +686,7 @@ jobs:
env: OPENSEARCH_VERSION=2.4.0 env: OPENSEARCH_VERSION=2.4.0
- name: OTLP Trace - name: OTLP Trace
config: test/e2e-v2/cases/otlp-traces/e2e.yaml config: test/e2e-v2/cases/otlp-traces/e2e.yaml
- name: Cilium Service - name: Cilium Service
config: test/e2e-v2/cases/cilium/e2e.yaml config: test/e2e-v2/cases/cilium/e2e.yaml
@ -725,7 +725,7 @@ jobs:
if: matrix.test.docker != null 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 }} 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 }} - name: ${{ matrix.test.name }}
uses: apache/skywalking-infra-e2e@7f6b0da20f170b181a79cf89ef7d47848ac34138 uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
with: with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }} e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
- if: ${{ failure() }} - if: ${{ failure() }}
@ -782,7 +782,7 @@ jobs:
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: ${{ matrix.test.name }} - name: ${{ matrix.test.name }}
uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
env: env:
ISTIO_VERSION: ${{ matrix.versions.istio }} ISTIO_VERSION: ${{ matrix.versions.istio }}
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }} KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@ -840,7 +840,7 @@ jobs:
shell: bash shell: bash
run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package
- name: Java version ${{ matrix.java-version }} - name: Java version ${{ matrix.java-version }}
uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
env: env:
SW_AGENT_JDK_VERSION: ${{ matrix.java-version }} SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
with: with:
@ -886,4 +886,3 @@ jobs:
[[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8; [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;
exit 0; exit 0;

1
docs/en/changes/changes.md
View File

@ -4,6 +4,7 @@
* E2E: bump up the version of the opentelemetry-collector to 0.102.1. * E2E: bump up the version of the opentelemetry-collector to 0.102.1.
* Push snapshot data-generator docker image to ghcr.io. * Push snapshot data-generator docker image to ghcr.io.
* Bump up skywalking-infra-e2e to work around GHA removing `docker-compose` v1.
#### OAP Server #### OAP Server