[skywalking] branch es7.10 updated (53d5ed9 -> 991ac09)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch es7.10
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 53d5ed9  Add ElasticSearch 7.10 to test matrix
     new 991ac09  Add ElasticSearch 7.10 to test matrix

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (53d5ed9)
            \
             N -- N -- N   refs/heads/es7.10 (991ac09)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

[skywalking] 01/01: Add ElasticSearch 7.10 to test matrix

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch es7.10
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 991ac09a4f7eb938b934613930ea05d3f772b0ce
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Jan 4 20:41:54 2021 +0800

    Add ElasticSearch 7.10 to test matrix
---
 .github/workflows/e2e.storages.yaml                                     | 2 +-
 CHANGES.md                                                              | 1 +
 .../storage/{docker-compose.es7.9.yml => docker-compose.es7.10.yml}     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index 370c4ee..ca83559 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['mysql', 'es6', 'es7.0', 'es7.9', 'influxdb', 'tidb']
+        storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'influxdb', 'tidb']
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:
diff --git a/CHANGES.md b/CHANGES.md
index d2d4d98..0348f1f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Release Notes.
 * Incompatible with previous releases when use H2/MySQL/TiDB storage options, due to support multiple alarm rules triggered for one entity.
 * Chore: adapt `create_source_release.sh` to make it runnable on Linux.
 * 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.
 
 #### Java Agent
 * The operation name of quartz-scheduler plugin, has been changed as the `quartz-scheduler/${className}` format.
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
similarity index 97%
rename from test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml
rename to test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
index b38fc49..19078a2 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.9.3
+    image: elastic/elasticsearch:7.10.1
     expose:
       - 9200
     networks: