This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/es-7 in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 71eebeb347ece1e3e648116548e1a196d72ae3b5 Author: kezhenxu94 <kezhenx...@163.com> AuthorDate: Tue Nov 3 15:00:48 2020 +0800 test: E2E Elasticsearch 7.x highest and lowest versions --- .github/workflows/docker-ci.yaml | 1 + .github/workflows/e2e.go.yaml | 1 + .github/workflows/e2e.istio.yaml | 1 + .github/workflows/e2e.js.yaml | 1 + .github/workflows/e2e.kafka.yaml | 1 + .github/workflows/e2e.php.yaml | 1 + .github/workflows/e2e.profiling.yaml | 1 + .github/workflows/e2e.python.yaml | 1 + .github/workflows/e2e.storages.yaml | 3 ++- .github/workflows/e2e.ttl.yaml | 1 + .github/workflows/e2e.yaml | 2 ++ .../storage/{docker-compose.es7.yml => docker-compose.es7.0.yml} | 2 +- .../storage/{docker-compose.es7.yml => docker-compose.es7.9.yml} | 2 +- 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml index f6fe273..49f1ffc 100644 --- a/.github/workflows/docker-ci.yaml +++ b/.github/workflows/docker-ci.yaml @@ -19,6 +19,7 @@ name: docker-ci on: pull_request: paths: + - '**' - '!**.md' env: diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml index d316bd2..eee18dc 100644 --- a/.github/workflows/e2e.go.yaml +++ b/.github/workflows/e2e.go.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index 34d590e..0ff13c0 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -19,6 +19,7 @@ name: Istio on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml index ae8616c..5788a73 100644 --- a/.github/workflows/e2e.js.yaml +++ b/.github/workflows/e2e.js.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml index 56935a5..53111b0 100644 --- a/.github/workflows/e2e.kafka.yaml +++ b/.github/workflows/e2e.kafka.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml index 495ab8f..69f4589 100644 --- a/.github/workflows/e2e.php.yaml +++ b/.github/workflows/e2e.php.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index 75b0940..cae7aea 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml index 20a3940..3382df5 100644 --- a/.github/workflows/e2e.python.yaml +++ b/.github/workflows/e2e.python.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 0b9cd36..509a422 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -21,6 +21,7 @@ on: push: branches: - master + - test/es-7 env: SKIP_TEST: true @@ -34,7 +35,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: diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 7f1e3f6..645fb88 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -19,6 +19,7 @@ name: E2E on: pull_request: paths: + - '**' - '!**.md' push: branches: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2caf64d..e53e2d5 100644 --- a/.github/workflows/e2e.yaml +++ b/.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: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml similarity index 97% copy from test/e2e/e2e-test/docker/storage/docker-compose.es7.yml copy to test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml index a9c9744..1b9cc7d 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml +++ b/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: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml similarity index 97% rename from test/e2e/e2e-test/docker/storage/docker-compose.es7.yml rename to test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml index a9c9744..78ebfc6 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.9.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.4.2 + image: elastic/elasticsearch:7.9.3 expose: - 9200 networks: