Skip to content

Commit

Permalink
Adapt eBPF related E2E (apache#11983)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrproliu authored Mar 6, 2024
1 parent e92c348 commit 6d8524f
Show file tree
Hide file tree
Showing 80 changed files with 1,270 additions and 2,920 deletions.
141 changes: 70 additions & 71 deletions .github/workflows/skywalking.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -467,73 +467,69 @@ jobs:
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
# - name: eBPF Profiling On CPU H2
# config: test/e2e-v2/cases/profiling/ebpf/oncpu/h2/e2e.yaml
# - name: eBPF Profiling On CPU ES
# config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
# - name: eBPF Profiling On CPU ES
# config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
# - name: eBPF Profiling On CPU MySQL
# config: test/e2e-v2/cases/profiling/ebpf/oncpu/mysql/e2e.yaml
# - name: eBPF Profiling On CPU Postgres
# config: test/e2e-v2/cases/profiling/ebpf/oncpu/postgres/e2e.yaml
# - 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.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
# runs-on: ubuntu-20.04
# - name: eBPF Profiling Network BanyanDB
# config: test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
# - name: eBPF Profiling Network H2
# config: test/e2e-v2/cases/profiling/ebpf/network/h2/e2e.yaml
# - name: eBPF Profiling Network ES
# config: test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
# - name: eBPF Profiling Network ES Sharding
# config: test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
# - name: eBPF Profiling Network MySQL
# config: test/e2e-v2/cases/profiling/ebpf/network/mysql/e2e.yaml
# - name: eBPF Profiling Network Postgres
# config: test/e2e-v2/cases/profiling/ebpf/network/postgres/e2e.yaml
# - name: eBPF Profiling Network OpenSearch 1.1.0
# config: test/e2e-v2/cases/profiling/ebpf/network/opensearch/e2e.yaml
# env: OPENSEARCH_VERSION=1.1.0
# - name: eBPF Profiling Network OpenSearch 1.3.6
# config: test/e2e-v2/cases/profiling/ebpf/network/opensearch/e2e.yaml
# env: OPENSEARCH_VERSION=1.3.6
# - name: eBPF Profiling Network OpenSearch 2.4.0
# config: test/e2e-v2/cases/profiling/ebpf/network/opensearch/e2e.yaml
# env: OPENSEARCH_VERSION=2.4.0

# - name: Continuous Profiling BanyanDB
# config: test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
# - name: Continuous Profiling H2
# config: test/e2e-v2/cases/profiling/ebpf/continuous/h2/e2e.yaml
# - name: Continuous Profiling ES
# config: test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
# - name: Continuous Profiling Sharding ES
# config: test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
# - name: Continuous Profiling MySQL
# config: test/e2e-v2/cases/profiling/ebpf/continuous/mysql/e2e.yaml
# - name: Continuous Profiling Postgres
# config: test/e2e-v2/cases/profiling/ebpf/continuous/postgres/e2e.yaml
# - name: Continuous Profiling OpenSearch 1.1.0
# config: test/e2e-v2/cases/profiling/ebpf/continuous/opensearch/e2e.yaml
# env: OPENSEARCH_VERSION=1.1.0
# - name: Continuous Profiling OpenSearch 1.3.6
# config: test/e2e-v2/cases/profiling/ebpf/continuous/opensearch/e2e.yaml
# env: OPENSEARCH_VERSION=1.3.6
# - name: Continuous Profiling OpenSearch 2.4.0
# config: test/e2e-v2/cases/profiling/ebpf/continuous/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
docker:
base: test/e2e-v2/cases/profiling/ebpf/oncpu/
file: Dockerfile.sqrt
name: test/oncpu:test
- name: eBPF Profiling On CPU ES
config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/oncpu/
file: Dockerfile.sqrt
name: test/oncpu:test
- name: eBPF Profiling On CPU ES Sharding
config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/oncpu/
file: Dockerfile.sqrt
name: test/oncpu:test
- name: eBPF Profiling Off CPU
config: test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/offcpu/
file: Dockerfile.file
name: test/offcpu:test
runs-on: ubuntu-20.04

- name: eBPF Profiling Network BanyanDB
config: test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/network/
file: Dockerfile.service
name: test/network:test
- name: eBPF Profiling Network ES
config: test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/network/
file: Dockerfile.service
name: test/network:test
- name: eBPF Profiling Network ES Sharding
config: test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/network/
file: Dockerfile.service
name: test/network:test

- name: Continuous Profiling BanyanDB
config: test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/continuous/
file: Dockerfile.sqrt
name: test/continuous:test
- name: Continuous Profiling ES
config: test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/continuous/
file: Dockerfile.sqrt
name: test/continuous:test
- name: Continuous Profiling Sharding ES
config: test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
docker:
base: test/e2e-v2/cases/profiling/ebpf/continuous/
file: Dockerfile.sqrt
name: test/continuous:test

- name: Kafka Basic
config: test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
Expand Down Expand Up @@ -565,10 +561,10 @@ jobs:
ISTIO_VERSION=1.18.0
KUBERNETES_VERSION=25
# - name: Rover with Istio Process 1.15.0
# config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
# env: ISTIO_VERSION=1.15.0
# runs-on: ubuntu-20.04
- name: Rover with Istio Process 1.15.0
config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
env: ISTIO_VERSION=1.15.0
runs-on: ubuntu-20.04

- name: Satellite
config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
Expand Down Expand Up @@ -708,6 +704,9 @@ jobs:
- name: Set env var
run: |
echo "${{ matrix.test.env }}" >> $GITHUB_ENV
- name: Build test image
if: matrix.test.docker != null
run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }}
- name: ${{ matrix.test.name }}
uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
with:
Expand Down

This file was deleted.

52 changes: 49 additions & 3 deletions test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,63 @@
# This file is used to show how to write configuration files and can be used to test.

setup:
env: compose
file: docker-compose.yml
timeout: 20m
env: kind
file: ../../kind.yaml
init-system-environment: ../../../../../script/env
kind:
import-images:
- skywalking/ui:latest
- skywalking/oap:latest
- test/continuous:test
expose-ports:
- namespace: istio-system
resource: service/skywalking-ui
port: 80
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
- name: install yq
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh yq
- name: install swctl
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh swctl
- name: install kubectl
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
- name: Install helm
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
- name: Install kubectl
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
- name: Install SkyWalking
command: |
kubectl create namespace istio-system
helm -n istio-system install skywalking \
oci://ghcr.io/apache/skywalking-helm/skywalking-helm \
--version "0.0.0-${SW_KUBERNETES_COMMIT_SHA}" \
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
--set oap.image.tag=latest \
--set oap.image.repository=skywalking/oap \
--set oap.storageType=banyandb \
-f test/e2e-v2/cases/profiling/ebpf/kubernetes-values.yaml
wait:
- namespace: istio-system
resource: deployments/skywalking-oap
for: condition=available
- name: Deploy services
command: |
export IMAGE_NAME=test/continuous:test
export HAS_SERVICE_EXP=".Pod.HasContainer \\\"test-continuous\\\""
export SERVICE_NAME_EXP="sqrt"
envsubst < test/e2e-v2/cases/profiling/ebpf/continuous/service.yaml | kubectl apply -f -
envsubst < test/e2e-v2/cases/profiling/ebpf/rover.yaml | kubectl apply -f -
wait:
- namespace: default
resource: pod
for: condition=Ready
timeout: 25m

verify:
retry:
Expand Down
62 changes: 0 additions & 62 deletions test/e2e-v2/cases/profiling/ebpf/continuous/docker-compose.yml

This file was deleted.

Loading

0 comments on commit 6d8524f

Please sign in to comment.