This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test-os
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8db4b7fc8b80cbfdfb7d14785be577818b076309
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Sun Nov 27 19:54:26 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, 28 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 001aa30bae..63502d401b 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -29,7 +29,7 @@ env:
SW_AGENT_JDK_VERSION: 8
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5 # Cache restore timeout
-
+
jobs:
license-header:
if: (github.event_name == 'schedule' && github.repository ==
'apache/skywalking') || (github.event_name != 'schedule')
@@ -373,9 +373,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 2.3.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.3.0
+ env: OPENSEARCH_VERSION=2.4.0
- name: Storage ES Sharding
config: test/e2e-v2/cases/storage/es/es-sharding/e2e.yaml
@@ -483,6 +486,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
@@ -504,6 +513,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 d171afbb8c..6190aea109 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
@@ -104,6 +104,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))
}
});
}
