You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/09/28 05:34:52 UTC
[skywalking] branch es created (now 68ec647)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch es
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 68ec647 Add ElasticSearch 7.15 to test matrix
This branch includes the following new commits:
new 68ec647 Add ElasticSearch 7.15 to test matrix
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Add ElasticSearch 7.15 to test matrix
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch es
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 68ec64725f2f4593a011820cf332d4483d5e0ad3
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Sep 28 13:34:33 2021 +0800
Add ElasticSearch 7.15 to test matrix
---
.github/workflows/e2e.storages.yaml | 12 +++++-
...er-compose.es7.14.yml => docker-compose.es.yml} | 2 +-
.../e2e-test/docker/storage/docker-compose.es6.yml | 47 ----------------------
.../docker/storage/docker-compose.es7.0.yml | 47 ----------------------
.../docker/storage/docker-compose.es7.10.yml | 47 ----------------------
5 files changed, 12 insertions(+), 143 deletions(-)
diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index ea4ba9c..c061f97 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -20,6 +20,9 @@ on:
pull_request:
schedule:
- cron: '0 18 * * *'
+ push:
+ branches:
+ - es
env:
SW_AGENT_JDK_VERSION: 8
@@ -36,9 +39,16 @@ jobs:
timeout-minutes: 90
strategy:
matrix:
- storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'es7.14', 'opensearch', 'influxdb', 'tidb', 'postgresql']
+ storage: ['mysql', 'es', 'opensearch', 'influxdb', 'tidb', 'postgresql']
+ include:
+ - { storage: es, es-version: 6.3.2 }
+ - { storage: es, es-version: 7.0.0 }
+ - { storage: es, es-version: 7.10.1 }
+ - { storage: es, es-version: 7.14.0 }
+ - { storage: es, es-version: 7.15.0 }
env:
SW_STORAGE: ${{ matrix.storage }}
+ ES_VERSION: ${{ matrix.es-version }}
steps:
- uses: actions/checkout@v2
with:
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es.yml
similarity index 96%
rename from test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml
rename to test/e2e/e2e-test/docker/storage/docker-compose.es.yml
index 53ce509..c416695 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.es.yml
@@ -17,7 +17,7 @@ version: '2.1'
services:
es:
- image: elastic/elasticsearch:7.14.0
+ image: elastic/elasticsearch:${ES_VERSION}
expose:
- 9200
networks:
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml
deleted file mode 100644
index 9cc21be..0000000
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml
+++ /dev/null
@@ -1,47 +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.
-
-version: '2.1'
-
-services:
- es:
- image: elastic/elasticsearch:6.3.2
- expose:
- - 9200
- networks:
- - e2e
- environment:
- - discovery.type=single-node
- - cluster.routing.allocation.disk.threshold_enabled=false
- healthcheck:
- test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
- interval: 5s
- timeout: 60s
- retries: 120
-
- oap:
- extends:
- file: ../base-compose.yml
- service: oap
- environment:
- SW_STORAGE: elasticsearch
- SW_PROMETHEUS_FETCHER: "default"
- SW_TELEMETRY: prometheus
- depends_on:
- es:
- condition: service_healthy
-
-networks:
- e2e:
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml
deleted file mode 100644
index 2702f08..0000000
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml
+++ /dev/null
@@ -1,47 +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.
-
-version: '2.1'
-
-services:
- es:
- image: elastic/elasticsearch:7.0.0
- expose:
- - 9200
- networks:
- - e2e
- environment:
- - discovery.type=single-node
- - cluster.routing.allocation.disk.threshold_enabled=false
- healthcheck:
- test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
- interval: 5s
- timeout: 60s
- retries: 120
-
- oap:
- extends:
- file: ../base-compose.yml
- service: oap
- environment:
- SW_STORAGE: elasticsearch
- SW_PROMETHEUS_FETCHER: "default"
- SW_TELEMETRY: prometheus
- depends_on:
- es:
- condition: service_healthy
-
-networks:
- e2e:
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
deleted file mode 100644
index 8e4384e..0000000
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
+++ /dev/null
@@ -1,47 +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.
-
-version: '2.1'
-
-services:
- es:
- image: elastic/elasticsearch:7.10.1
- expose:
- - 9200
- networks:
- - e2e
- environment:
- - discovery.type=single-node
- - cluster.routing.allocation.disk.threshold_enabled=false
- healthcheck:
- test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
- interval: 5s
- timeout: 60s
- retries: 120
-
- oap:
- extends:
- file: ../base-compose.yml
- service: oap
- environment:
- SW_STORAGE: elasticsearch
- SW_PROMETHEUS_FETCHER: "default"
- SW_TELEMETRY: prometheus
- depends_on:
- es:
- condition: service_healthy
-
-networks:
- e2e: