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 2022/11/27 11:00:39 UTC
[skywalking] branch os created (now cb4d0c8410)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch os
in repository https://gitbox.apache.org/repos/asf/skywalking.git
at cb4d0c8410 Add OpenSearch 1.3.6 and 2.4.0 to test matrix
This branch includes the following new commits:
new cb4d0c8410 Add OpenSearch 1.3.6 and 2.4.0 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 OpenSearch 1.3.6 and 2.4.0 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 os
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit cb4d0c8410985fd08763f1bfcc31fa37b970d095
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Nov 27 19:00:13 2022 +0800
Add OpenSearch 1.3.6 and 2.4.0 to test matrix
---
.github/workflows/skywalking.yaml | 21 +++++++++++++++++++++
.../library/elasticsearch/ITElasticSearchTest.java | 10 ++++++++++
2 files changed, 31 insertions(+)
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
index 580f52e4e9..0fb91fc1b8 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -20,6 +20,9 @@ on:
pull_request:
schedule:
- cron: "0 18 * * *" # TimeZone: UTC 0
+ push:
+ branches:
+ - os
concurrency:
group: skywalking-${{ github.event.pull_request.number || github.ref }}
@@ -339,6 +342,12 @@ jobs:
- name: Storage OpenSearch 1.2.0
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.2.0
+ - name: Storage OpenSearch 1.3.6
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.6
+ - name: Storage OpenSearch 2.4.0
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
- name: Storage ES Sharding
config: test/e2e-v2/cases/storage/es/es-sharding/e2e.yaml
@@ -446,6 +455,12 @@ jobs:
- name: Trace Profiling OpenSearch 1.2.0
config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.2.0
+ - name: Trace Profiling OpenSearch 1.3.6
+ config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.6
+ - name: Trace Profiling OpenSearch 2.4.0
+ config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
- name: eBPF Profiling On CPU BanyanDB
config: test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
@@ -467,6 +482,12 @@ jobs:
- name: eBPF Profiling On CPU OpenSearch 1.2.0
config: test/e2e-v2/cases/profiling/ebpf/oncpu/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.2.0
+ - name: eBPF Profiling On CPU OpenSearch 1.3.6
+ config: test/e2e-v2/cases/profiling/ebpf/oncpu/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.6
+ - name: eBPF Profiling On CPU OpenSearch 2.4.0
+ config: test/e2e-v2/cases/profiling/ebpf/oncpu/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
- name: eBPF Profiling Off CPU
config: test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
- name: eBPF Profiling Network
diff --git a/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java b/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java
index 53ef4af118..412309d19f 100644
--- a/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java
+++ b/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java
@@ -94,6 +94,16 @@ public class ITElasticSearchTest {
"docker.elastic.co/elasticsearch/elasticsearch-oss"))
.withEnv("plugins.security.disabled", "true")
.withStartupTimeout(java.time.Duration.ofMinutes(5))
+ },
+ {
+ "OpenSearch 2.4.0",
+ new ElasticsearchContainer(
+ DockerImageName.parse("opensearchproject/opensearch")
+ .withTag("2.4.0")
+ .asCompatibleSubstituteFor(
+ "docker.elastic.co/elasticsearch/elasticsearch-oss"))
+ .withEnv("plugins.security.disabled", "true")
+ .withStartupTimeout(java.time.Duration.ofMinutes(5))
}
});
}