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 12:02:10 UTC
[skywalking] branch test-os updated (8db4b7fc8b -> a29421ad46)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test-os
in repository https://gitbox.apache.org/repos/asf/skywalking.git
discard 8db4b7fc8b Add OpenSearch 1.3.6 and 2.4.0 to test matrix
new a29421ad46 Add OpenSearch 1.3.6 and 2.4.0 to test matrix
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8db4b7fc8b)
\
N -- N -- N refs/heads/test-os (a29421ad46)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.github/workflows/skywalking.yaml | 9 ---------
1 file changed, 9 deletions(-)
[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 test-os
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit a29421ad46fa7a49351d652e4a22d577d0f8351e
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Nov 27 20:02:00 2022 +0800
Add OpenSearch 1.3.6 and 2.4.0 to test matrix
---
.github/workflows/skywalking.yaml | 24 ++++++++++++++--------
.../library/elasticsearch/ITElasticSearchTest.java | 10 +++++++++
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
index 001aa30bae..bac0294f6b 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')
@@ -370,12 +370,12 @@ jobs:
- name: Storage OpenSearch 1.1.0
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.1.0
- - name: Storage OpenSearch 1.2.0
+ - name: Storage OpenSearch 1.3.6
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
- env: OPENSEARCH_VERSION=1.2.0
- - name: Storage OpenSearch 2.3.0
+ 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
@@ -480,9 +480,12 @@ jobs:
- name: Trace Profiling OpenSearch 1.1.0
config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.1.0
- - name: Trace Profiling OpenSearch 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=1.2.0
+ env: OPENSEARCH_VERSION=2.4.0
- name: eBPF Profiling On CPU BanyanDB
config: test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
@@ -501,9 +504,12 @@ jobs:
- name: eBPF Profiling On CPU OpenSearch 1.1.0
config: test/e2e-v2/cases/profiling/ebpf/oncpu/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=1.1.0
- - name: eBPF Profiling On CPU OpenSearch 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=1.2.0
+ 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))
}
});
}