diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index b4dc43f9c..bd72a5d16 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -27,7 +27,6 @@ on: env: SKIP_TEST: true ES_VERSION: es7 - ISTIO_VERSION: 1.7.1 TAG: ${{ github.sha }} SCRIPTS_DIR: test/e2e-mesh/e2e-istio/scripts SW_OAP_BASE_IMAGE: openjdk:11-jdk @@ -40,7 +39,10 @@ jobs: fail-fast: true matrix: analyzer: [k8s-mesh, mx-mesh] - name: Istio+ALS(${{ matrix.analyzer }}) + istio_version: [1.7.1, 1.8.2] + name: Istio(${{ matrix.istio_version }})+ALS(${{ matrix.analyzer }}) + env: + ISTIO_VERSION: ${{ matrix.istio_version }} steps: - uses: actions/checkout@v2 with: @@ -134,7 +136,13 @@ jobs: metrics-service: runs-on: ubuntu-16.04 timeout-minutes: 60 - name: MetricsService + name: Istio(${{ matrix.istio_version }})+MetricsService + strategy: + fail-fast: true + matrix: + istio_version: [1.7.1, 1.8.2] + env: + ISTIO_VERSION: ${{ matrix.istio_version }} steps: - uses: actions/checkout@v2 with: diff --git a/CHANGES.md b/CHANGES.md index 91a8d4eaf..51d722c84 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ Release Notes. * Add `package` to `.proto` files, prevent polluting top-level namespace in some languages; The OAP server supports previous agent releases, whereas the previous OAP server (<=8.3.0) won't recognize newer agents since this version (>= 8.4.0). * Add ElasticSearch 7.10 to test matrix and verify it works. * Replace Apache RAT with skywalking-eyes to check license headers. +* Set up test of Envoy ALS / MetricsService under Istio 1.8.2 to verify Envoy V3 protocol #### Java Agent * The operation name of quartz-scheduler plugin, has been changed as the `quartz-scheduler/${className}` format. diff --git a/test/e2e-mesh/e2e-istio/scripts/istio.sh b/test/e2e-mesh/e2e-istio/scripts/istio.sh index 2578818bc..1fb8c2a93 100644 --- a/test/e2e-mesh/e2e-istio/scripts/istio.sh +++ b/test/e2e-mesh/e2e-istio/scripts/istio.sh @@ -22,5 +22,5 @@ set -ex istioctl version || (curl -L https://istio.io/downloadIstio | sh - && sudo mv $PWD/istio-$ISTIO_VERSION/bin/istioctl /usr/local/bin/) -istioctl install $@ +istioctl install -y $@ kubectl label namespace default istio-injection=enabled