Add ElasticSearch 7.10 to test matrix (#6137)

2021-01-07 10:11:13 +08:00 · 2021-01-07 10:11:13 +08:00 · f3d5153a80
parent 1307b0b5fa
commit f3d5153a80
4 changed files with 23 additions and 22 deletions
--- a/.github/workflows/cancel.yaml
+++ b/.github/workflows/cancel.yaml
@ -29,140 +29,140 @@ jobs:
    runs-on: ubuntu-18.04
    timeout-minutes: 10
    steps:
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds ci-it.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: ci-it.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds docker-ci.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: docker-ci.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.cluster.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.cluster.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.go.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.go.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.istio.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.istio.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.jdk-versions.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.jdk-versions.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.js.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.js.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.kafka.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.kafka.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.php.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.php.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.php.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.php.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.profiling.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.profiling.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.python.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.python.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.storages.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.storages.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.ttl.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.ttl.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds e2e.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: e2e.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds plugins-jdk14-test.0.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: plugins-jdk14-test.0.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds plugins-test.0.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: plugins-test.0.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds plugins-test.1.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: plugins-test.1.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds plugins-test.2.yaml
        with:
          cancelMode: allDuplicates
          token: ${{ secrets.GITHUB_TOKEN }}
          sourceRunId: ${{ github.event.workflow_run.id }}
          workflowFileName: plugins-test.2.yaml
-      - uses: apache/airflow-cancel-workflow-runs@f4745c8ce1955c28676b5afe129a88a61aa743b9
+      - uses: apache/airflow-cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738
        name: Cancel Outdated Builds plugins-test.3.yaml
        with:
          cancelMode: allDuplicates
--- 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:
--- 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.
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.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: