This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e2f0bee06b Clean up tests for components that are too old (#10981)
e2f0bee06b is described below
commit e2f0bee06b98910f15087604aa1b983a09efe790
Author: kezhenxu94 <[email protected]>
AuthorDate: Fri Jun 23 22:42:23 2023 +0800
Clean up tests for components that are too old (#10981)
---
.github/workflows/skywalking.yaml | 169 ++++++---------------
docs/en/changes/changes.md | 1 +
docs/en/setup/backend/backend-storage.md | 2 +-
test/e2e-v2/cases/istio/kind.k18.yaml | 26 ----
test/e2e-v2/cases/istio/kind.k20.yaml | 26 ----
.../cases/istio/{kind.k19.yaml => kind.k25.yaml} | 8 +-
test/e2e-v2/cases/rover/process/istio/kind.yaml | 8 +-
7 files changed, 53 insertions(+), 187 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 52226fb86e..4b759ab460 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -358,36 +358,24 @@ jobs:
config: test/e2e-v2/cases/storage/mysql/e2e.yaml
- name: Storage PostgreSQL
config: test/e2e-v2/cases/storage/postgres/e2e.yaml
- - name: Storage ES 6.3.2
+ - name: Storage ES 7.16.3
config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=6.3.2
- - name: Storage ES 7.0.0
+ env: ES_VERSION=7.16.3
+ - name: Storage ES 7.17.10
config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=7.0.0
- - name: Storage ES 7.8.0
- config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=7.8.0
- - name: Storage ES 7.10.1
- config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=7.10.1
- - name: Storage ES 7.14.0
- config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=7.14.0
- - name: Storage ES 7.15.0
- config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=7.15.0
- - name: Storage ES 8.0.0
- config: test/e2e-v2/cases/storage/es/e2e.yaml
- env: ES_VERSION=8.0.0
+ env: ES_VERSION=7.17.10
- name: Storage ES 8.1.0
config: test/e2e-v2/cases/storage/es/e2e.yaml
env: ES_VERSION=8.1.0
+ - name: Storage ES 8.8.1
+ config: test/e2e-v2/cases/storage/es/e2e.yaml
+ env: ES_VERSION=8.8.1
- name: Storage OpenSearch 1.1.0
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.1.0
- - name: Storage OpenSearch 1.3.6
+ - name: Storage OpenSearch 1.3.10
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
- env: OPENSEARCH_VERSION=1.3.6
+ env: OPENSEARCH_VERSION=1.3.10
- name: Storage OpenSearch 2.4.0
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=2.4.0
@@ -408,15 +396,12 @@ jobs:
- name: Alarm PostgreSQL
config: test/e2e-v2/cases/alarm/postgres/e2e.yaml
- - name: TTL ES 6.3.2
- config: test/e2e-v2/cases/ttl/es/e2e.yaml
- env: ES_VERSION=6.3.2
- - name: TTL ES 7.15.0
+ - name: TTL ES 7.16.3
config: test/e2e-v2/cases/ttl/es/e2e.yaml
- env: ES_VERSION=7.15.0
- - name: TTL ES 8.0.0
+ env: ES_VERSION=7.16.3
+ - name: TTL ES 8.8.1
config: test/e2e-v2/cases/ttl/es/e2e.yaml
- env: ES_VERSION=8.0.0
+ env: ES_VERSION=8.8.1
- name: Event BanyanDB
config: test/e2e-v2/cases/event/banyandb/e2e.yaml
@@ -433,49 +418,25 @@ jobs:
config: test/e2e-v2/cases/log/mysql/e2e.yaml
- name: Log PostgreSQL
config: test/e2e-v2/cases/log/postgres/e2e.yaml
- - name: Log ES 6.3.2
+ - name: Log ES 7.16.3
config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=6.3.2
- - name: Log ES 7.0.0
+ env: ES_VERSION=7.16.3
+ - name: Log ES 7.17.10
config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=7.0.0
- - name: Log ES 7.8.0
- config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=7.8.0
- - name: Log ES 7.10.1
- config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=7.10.1
- - name: Log ES 7.14.0
- config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=7.14.0
- - name: Log ES 7.15.0
- config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=7.15.0
- - name: Log ES 8.0.0
- config: test/e2e-v2/cases/log/es/e2e.yaml
- env: ES_VERSION=8.0.0
- - name: Log ES 8.0.0 Shardng
+ env: ES_VERSION=7.17.10
+ - name: Log ES 8.8.1 Shardng
config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
- env: ES_VERSION=8.0.0
+ env: ES_VERSION=8.8.1
- - name: Log FluentBit ES 6.3.2
- config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=6.3.2
- - name: Log FluentBit ES 7.0.0
- config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=7.0.0
- - name: Log FluentBit ES 7.8.0
- config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=7.8.0
- - name: Log FluentBit ES 7.10.1
+ - name: Log FluentBit ES 7.16.3
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=7.10.1
- - name: Log FluentBit ES 7.14.0
+ env: ES_VERSION=7.16.3
+ - name: Log FluentBit ES 7.17.10
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=7.14.0
- - name: Log FluentBit ES 7.15.0
+ env: ES_VERSION=7.17.10
+ - name: Log FluentBit ES 8.8.1
config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
- env: ES_VERSION=7.15.0
+ env: ES_VERSION=8.8.1
- name: Trace Profiling BanyanDB
config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
@@ -576,56 +537,26 @@ jobs:
- name: Kafka Log
config: test/e2e-v2/cases/kafka/log/e2e.yaml
- - name: Istio Metrics Service 1.8.2
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.8.2
- KUBERNETES_VERSION=19
- - name: Istio Metrics Service 1.9.1
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.9.1
- KUBERNETES_VERSION=20
- - name: Istio Metrics Service 1.10.3
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.10.3
- KUBERNETES_VERSION=20
- - name: Istio Metrics Service 1.11.4
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.11.4
- KUBERNETES_VERSION=20
- - name: Istio Metrics Service 1.12.0
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.12.0
- KUBERNETES_VERSION=20
- - name: Istio Metrics Service 1.13.1
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.13.1
- KUBERNETES_VERSION=20
- - name: Istio Metrics Service 1.14.4
- config: test/e2e-v2/cases/istio/metrics/e2e.yaml
- env: |
- ISTIO_VERSION=1.14.4
- KUBERNETES_VERSION=20
- name: Istio Metrics Service 1.15.0
config: test/e2e-v2/cases/istio/metrics/e2e.yaml
env: |
ISTIO_VERSION=1.15.0
- KUBERNETES_VERSION=20
+ KUBERNETES_VERSION=25
- name: Istio Metrics Service 1.16.0
config: test/e2e-v2/cases/istio/metrics/e2e.yaml
env: |
ISTIO_VERSION=1.16.0
- KUBERNETES_VERSION=20
+ KUBERNETES_VERSION=25
- name: Istio Metrics Service 1.17.0
config: test/e2e-v2/cases/istio/metrics/e2e.yaml
env: |
ISTIO_VERSION=1.17.0
- KUBERNETES_VERSION=20
+ KUBERNETES_VERSION=25
+ - name: Istio Metrics Service 1.18.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.18.0
+ KUBERNETES_VERSION=25
- name: Satellite
config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
@@ -654,9 +585,9 @@ jobs:
- name: MariaDB Prometheus and slowsql
config: test/e2e-v2/cases/mariadb/mariadb-slowsql/e2e.yaml
- - name: Rover with Istio Process 1.13.1
+ - name: Rover with Istio Process 1.15.0
config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
- env: ISTIO_VERSION=1.13.1
+ env: ISTIO_VERSION=1.15.0
runs-on: ubuntu-20.04
- name: Zipkin ES
@@ -727,7 +658,7 @@ jobs:
run: |
echo "${{ matrix.test.env }}" >> $GITHUB_ENV
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@2b3aa53dbba73909730b211d5b8065abc74b56ad
+ uses:
apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
- uses: actions/upload-artifact@v2
@@ -750,28 +681,14 @@ jobs:
matrix:
analyzer: [k8s-mesh, mx-mesh]
versions:
- #- istio: 1.7.1
- # kubernetes: 18
- - istio: 1.8.2
- kubernetes: 19
- - istio: 1.9.1
- kubernetes: 19
- - istio: 1.10.3
- kubernetes: 19
- - istio: 1.11.4
- kubernetes: 19
- - istio: 1.12.0
- kubernetes: 19
- - istio: 1.13.1
- kubernetes: 20
- - istio: 1.14.4
- kubernetes: 20
- istio: 1.15.0
- kubernetes: 20
+ kubernetes: 25
- istio: 1.16.0
- kubernetes: 20
+ kubernetes: 25
- istio: 1.17.0
- kubernetes: 20
+ kubernetes: 25
+ - istio: 1.18.0
+ kubernetes: 25
steps:
- uses: actions/checkout@v3
@@ -785,7 +702,7 @@ jobs:
- name: Load docker images
run: find docker-images -name "*.tar" -exec docker load -i {} \;
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@2b3aa53dbba73909730b211d5b8065abc74b56ad
+ uses:
apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
env:
ISTIO_VERSION: ${{ matrix.versions.istio }}
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -836,7 +753,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@2b3aa53dbba73909730b211d5b8065abc74b56ad
+ uses:
apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
env:
SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
with:
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 0aa57650f5..730656a7c6 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -15,6 +15,7 @@
* Add component ID for WebSphere.
* Fix AI Pipeline uri caching NullPointer and IllegalArgument Exceptions.
* Fix `NPE` in metrics query when the metric is not exist.
+* Remove E2E tests for Istio < 1.15, ElasticSearch < 7.16.3, they might still
work but are not supported as planed.
#### UI
* Fix metric name `browser_app_error_rate` in `Browser-Root` dashboard.
diff --git a/docs/en/setup/backend/backend-storage.md
b/docs/en/setup/backend/backend-storage.md
index e699f0b9ac..272369c09c 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -10,7 +10,7 @@ storage:
Natively supported storage:
- H2
- OpenSearch
-- ElasticSearch 6, 7, 8
+- ElasticSearch 7, 8, ElasticSearch 6 might also work but is end of life and
not supported.
- MySQL
- PostgreSQL
- BanyanDB
diff --git a/test/e2e-v2/cases/istio/kind.k18.yaml
b/test/e2e-v2/cases/istio/kind.k18.yaml
deleted file mode 100644
index 4952fb354f..0000000000
--- a/test/e2e-v2/cases/istio/kind.k18.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
- - role: control-plane
- image:
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7
- - role: worker
- image:
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7
- - role: worker
- image:
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7
- - role: worker
- image:
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7
diff --git a/test/e2e-v2/cases/istio/kind.k20.yaml
b/test/e2e-v2/cases/istio/kind.k20.yaml
deleted file mode 100644
index 0f156c1e27..0000000000
--- a/test/e2e-v2/cases/istio/kind.k20.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-nodes:
- - role: control-plane
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
- - role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
- - role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
- - role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
diff --git a/test/e2e-v2/cases/istio/kind.k19.yaml
b/test/e2e-v2/cases/istio/kind.k25.yaml
similarity index 68%
rename from test/e2e-v2/cases/istio/kind.k19.yaml
rename to test/e2e-v2/cases/istio/kind.k25.yaml
index e8e5d6c2b3..e3f7b97bd5 100644
--- a/test/e2e-v2/cases/istio/kind.k19.yaml
+++ b/test/e2e-v2/cases/istio/kind.k25.yaml
@@ -17,10 +17,10 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- image:
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
diff --git a/test/e2e-v2/cases/rover/process/istio/kind.yaml
b/test/e2e-v2/cases/rover/process/istio/kind.yaml
index 07407a0845..08ff4c7a05 100644
--- a/test/e2e-v2/cases/rover/process/istio/kind.yaml
+++ b/test/e2e-v2/cases/rover/process/istio/kind.yaml
@@ -19,10 +19,10 @@ kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
- role: worker
- image:
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
+ image:
kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
