This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
The following commit(s) were added to refs/heads/main by this push:
new 34040de5 Restore e2e by using latest oap (#648)
34040de5 is described below
commit 34040de5ee96bd9e401edb6bc4bd8202a1f662cc
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Apr 16 11:02:33 2025 +0800
Restore e2e by using latest oap (#648)
---
.github/workflows/ci.yml | 6 +++---
.github/workflows/test.yml | 2 +-
test/docker/base-compose.yml | 3 +--
test/e2e-v2/script/env | 2 +-
test/stress/classic/env | 2 +-
test/stress/classic/env.dev | 2 +-
test/stress/trace/env | 2 +-
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ecd0269a..5e60b920 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ env:
jobs:
check:
name: Check
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -93,7 +93,7 @@ jobs:
run: make check
build:
name: Build
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -143,7 +143,7 @@ jobs:
result:
name: Continuous Integration
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-24.04
needs: [check, build, test]
steps:
- run: echo 'success'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index da507ba2..0bd0b829 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ on:
jobs:
test:
name: Test
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
timeout-minutes: ${{ inputs.timeout-minutes }}
strategy:
matrix:
diff --git a/test/docker/base-compose.yml b/test/docker/base-compose.yml
index 4aae766f..9fcb81f9 100644
--- a/test/docker/base-compose.yml
+++ b/test/docker/base-compose.yml
@@ -59,8 +59,7 @@ services:
- sw_agent:/skywalking-java-agent
oap:
- # TODO: Update the image to the latest version
- image: "docker.io/hanahmily/oap:ca528d984506faee1276232f4ebd31eaba9db40c"
+ image: "ghcr.io/apache/skywalking/oap:${SW_OAP_COMMIT}"
expose:
- 11800
- 12800
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 7986d8c9..5c7958af 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -26,5 +26,5 @@ SW_ROVER_COMMIT=40d03c14d638339bf4aa6ec7376d421323de865a
SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
SW_CTL_COMMIT=67cbc89dd7b214d5791321a7ca992f940cb586ba
-SW_OAP_COMMIT=c2cdf07871647678087a31b31aca2385828eabe4
+SW_OAP_COMMIT=6273cb2c16e69a0a4df4e20d4a182469ff3c276c
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=d3f8fe894d1a206164b73f5b523d2eb62d9e9965
diff --git a/test/stress/classic/env b/test/stress/classic/env
index b9e9c623..c004cc4a 100644
--- a/test/stress/classic/env
+++ b/test/stress/classic/env
@@ -26,7 +26,7 @@ SW_ROVER_COMMIT=40d03c14d638339bf4aa6ec7376d421323de865a
SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
SW_CTL_COMMIT=67cbc89dd7b214d5791321a7ca992f940cb586ba
-SW_OAP_COMMIT=c2cdf07871647678087a31b31aca2385828eabe4
+SW_OAP_COMMIT=6273cb2c16e69a0a4df4e20d4a182469ff3c276c
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=d3f8fe894d1a206164b73f5b523d2eb62d9e9965
VUS=10
diff --git a/test/stress/classic/env.dev b/test/stress/classic/env.dev
index 99db5b25..f425b43a 100644
--- a/test/stress/classic/env.dev
+++ b/test/stress/classic/env.dev
@@ -26,7 +26,7 @@ SW_ROVER_COMMIT=40d03c14d638339bf4aa6ec7376d421323de865a
SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
SW_CTL_COMMIT=67cbc89dd7b214d5791321a7ca992f940cb586ba
-SW_OAP_COMMIT=c2cdf07871647678087a31b31aca2385828eabe4
+SW_OAP_COMMIT=6273cb2c16e69a0a4df4e20d4a182469ff3c276c
SW_AGENT_E2E_SERVICE_PROVIDER_COMMIT=d3f8fe894d1a206164b73f5b523d2eb62d9e9965
VUS=1
diff --git a/test/stress/trace/env b/test/stress/trace/env
index 03ad3857..76f2d5da 100644
--- a/test/stress/trace/env
+++ b/test/stress/trace/env
@@ -14,4 +14,4 @@
# limitations under the License.
-SW_OAP_COMMIT=c2cdf07871647678087a31b31aca2385828eabe4
+SW_OAP_COMMIT=6273cb2c16e69a0a4df4e20d4a182469ff3c276c
