test: E2E Elasticsearch 7.x highest and lowest versions (#5779)

.github/workflows/docker-ci.yaml

@@ -19,6 +19,7 @@ name: docker-ci
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
 
 env:

.github/workflows/e2e.go.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.istio.yaml

@@ -19,6 +19,7 @@ name: Istio
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.js.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.kafka.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.php.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.profiling.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.python.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.storages.yaml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['mysql', 'es6', 'es7', 'influxdb']
+        storage: ['mysql', 'es6', 'es7.0', 'es7.9', 'influxdb']
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:

.github/workflows/e2e.ttl.yaml

@@ -19,6 +19,7 @@ name: E2E
 on:
   pull_request:
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

.github/workflows/e2e.yaml

@@ -18,7 +18,9 @@ name: E2E
 
 on:
   pull_request:
+    # Do not run this workflow when and only when `*.md` files are modified
     paths:
+      - '**'
       - '!**.md'
   push:
     branches:

CHANGES.md

@@ -5,6 +5,7 @@ Release Notes.
 8.3.0
 ------------------
 #### Project
+* Test: ElasticSearch version 7.0.0 and 7.9.3 as storage are E2E tested. 
 
 #### Java Agent
 * Support propagate the sending timestamp in MQ plugins to calculate the transfer latency in the async MQ scenarios.

test/e2e/e2e-test/docker/storage/docker-compose.es7.yml → test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml

@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: elastic/elasticsearch:7.4.2
+    image: elastic/elasticsearch:7.0.0
     expose:
       - 9200
     networks:

test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml

+# 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.9.3
+    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-es7
+    environment:
+      SW_STORAGE: elasticsearch7
+      SW_PROMETHEUS_FETCHER_ACTIVE: "true"
+      SW_TELEMETRY: prometheus
+    depends_on:
+      es:
+        condition: service_healthy
+
+networks:
+  e2e: