Skip to content

Commit db3efe8

Browse files
committed
Fix corrupted Kind YAML files, restore and re-apply changes properly
Restored Kind e2e files from master (awk dedup had corrupted YAML structure). Re-applied all changes using Edit tool instead of sed/awk: - BYDB env vars for access log via Helm --set - cleanup.collect with /tmp/access-log/ path - Intentional failure in oncpu for verification All 4 Kind YAML files validated with Ruby YAML parser.
1 parent a41c764 commit db3efe8

4 files changed

Lines changed: 37 additions & 0 deletions

File tree

test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
# the License. You may obtain a copy of the License at
77
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
910
# Unless required by applicable law or agreed to in writing, software
1011
# distributed under the License is distributed on an "AS IS" BASIS,
1112
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

1516
# This file is used to show how to write configuration files and can be used to test.
17+
1618
setup:
1719
env: kind
1820
file: ../../kind.yaml
@@ -37,6 +39,7 @@ setup:
3739
- name: Install helm
3840
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
3941
- name: Install kubectl
42+
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
4043
- name: Install SkyWalking
4144
command: |
4245
kubectl create namespace istio-system
@@ -67,27 +70,36 @@ setup:
6770
resource: deployments/skywalking-oap
6871
for: condition=available
6972
- name: Deploy rover services
73+
command: |
7074
kubectl apply -f https://raw.githubusercontent.com/istio/istio/1.18.0/samples/bookinfo/platform/kube/bookinfo.yaml
7175
envsubst < test/e2e-v2/cases/profiling/ebpf/access_log/rover.yaml | kubectl apply -f -
76+
wait:
7277
- namespace: default
7378
resource: pod
7479
for: condition=Ready
7580
- name: Generate traffic
7681
path: ../traffic-gen.yaml
82+
wait:
83+
- namespace: default
84+
resource: pod
85+
for: condition=Ready
7786
timeout: 25m
87+
7888
verify:
7989
retry:
8090
count: 20
8191
interval: 10s
8292
cases:
8393
- includes:
8494
- ../accesslog-cases.yaml
95+
8596
cleanup:
8697
on: always
8798
collect:
8899
on: failure
89100
output-dir: $SW_INFRA_E2E_LOG_DIR/banyandb-data
90101
items:
102+
- namespace: istio-system
91103
label-selector: app.kubernetes.io/name=banyandb
92104
paths:
93105
- /tmp/trace/

test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
# the License. You may obtain a copy of the License at
77
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
910
# Unless required by applicable law or agreed to in writing, software
1011
# distributed under the License is distributed on an "AS IS" BASIS,
1112
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

1516
# This file is used to show how to write configuration files and can be used to test.
17+
1618
setup:
1719
env: kind
1820
file: ../../kind.yaml
@@ -38,6 +40,7 @@ setup:
3840
- name: Install helm
3941
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4042
- name: Install kubectl
43+
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
4144
- name: Install SkyWalking
4245
command: |
4346
kubectl create namespace istio-system
@@ -68,28 +71,33 @@ setup:
6871
resource: deployments/skywalking-oap
6972
for: condition=available
7073
- name: Deploy services
74+
command: |
7175
export IMAGE_NAME=test/continuous:test
7276
export HAS_SERVICE_EXP=".Pod.HasContainer \\\"test-continuous\\\""
7377
export SERVICE_NAME_EXP="sqrt"
7478
envsubst < test/e2e-v2/cases/profiling/ebpf/continuous/service.yaml | kubectl apply -f -
7579
envsubst < test/e2e-v2/cases/profiling/ebpf/rover.yaml | kubectl apply -f -
80+
wait:
7681
- namespace: default
7782
resource: pod
7883
for: condition=Ready
7984
timeout: 25m
85+
8086
verify:
8187
retry:
8288
count: 20
8389
interval: 10s
8490
cases:
8591
- includes:
8692
- ../profiling-cases.yaml
93+
8794
cleanup:
8895
on: always
8996
collect:
9097
on: failure
9198
output-dir: $SW_INFRA_E2E_LOG_DIR/banyandb-data
9299
items:
100+
- namespace: istio-system
93101
label-selector: app.kubernetes.io/name=banyandb
94102
paths:
95103
- /tmp/trace/

test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
# the License. You may obtain a copy of the License at
77
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
910
# Unless required by applicable law or agreed to in writing, software
1011
# distributed under the License is distributed on an "AS IS" BASIS,
1112
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

1516
# This file is used to show how to write configuration files and can be used to test.
17+
1618
setup:
1719
env: kind
1820
file: ../../kind.yaml
@@ -28,6 +30,7 @@ setup:
2830
port: 80
2931
- namespace: default
3032
resource: service/service
33+
port: 80
3134
steps:
3235
- name: set PATH
3336
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
@@ -40,6 +43,7 @@ setup:
4043
- name: Install helm
4144
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4245
- name: Install kubectl
46+
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
4347
- name: Install SkyWalking
4448
command: |
4549
kubectl create namespace istio-system
@@ -70,21 +74,25 @@ setup:
7074
resource: deployments/skywalking-oap
7175
for: condition=available
7276
- name: Deploy services
77+
command: |
7378
export IMAGE_NAME=test/network:test
7479
export HAS_SERVICE_EXP="or (.Pod.HasContainer \\\"service\\\") (.Pod.HasContainer \\\"nginx\\\")"
7580
export SERVICE_NAME_EXP="{{.Container.Name}}"
7681
envsubst < test/e2e-v2/cases/profiling/ebpf/network/service.yaml | kubectl apply -f -
7782
envsubst < test/e2e-v2/cases/profiling/ebpf/rover.yaml | kubectl apply -f -
83+
wait:
7884
- namespace: default
7985
resource: pod
8086
for: condition=Ready
8187
timeout: 25m
88+
8289
trigger:
8390
action: http
8491
interval: 3s
8592
times: -1
8693
url: http://${service_service_host}:${service_service_80}/consumer
8794
method: GET
95+
8896
verify:
8997
retry:
9098
count: 20
@@ -98,6 +106,7 @@ cleanup:
98106
on: failure
99107
output-dir: $SW_INFRA_E2E_LOG_DIR/banyandb-data
100108
items:
109+
- namespace: istio-system
101110
label-selector: app.kubernetes.io/name=banyandb
102111
paths:
103112
- /tmp/trace/

test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
# the License. You may obtain a copy of the License at
77
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
910
# Unless required by applicable law or agreed to in writing, software
1011
# distributed under the License is distributed on an "AS IS" BASIS,
1112
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

1516
# This file is used to show how to write configuration files and can be used to test.
17+
1618
setup:
1719
env: kind
1820
file: ../../kind.yaml
@@ -38,6 +40,7 @@ setup:
3840
- name: Install helm
3941
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh helm
4042
- name: Install kubectl
43+
command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh kubectl
4144
- name: Install SkyWalking
4245
command: |
4346
kubectl create namespace istio-system
@@ -68,15 +71,18 @@ setup:
6871
resource: deployments/skywalking-oap
6972
for: condition=available
7073
- name: Deploy services
74+
command: |
7175
export IMAGE_NAME=test/oncpu:test
7276
export HAS_SERVICE_EXP=".Pod.HasContainer \\\"sqrt\\\""
7377
export SERVICE_NAME_EXP="sqrt"
7478
envsubst < test/e2e-v2/cases/profiling/ebpf/oncpu/service.yaml | kubectl apply -f -
7579
envsubst < test/e2e-v2/cases/profiling/ebpf/rover.yaml | kubectl apply -f -
80+
wait:
7681
- namespace: default
7782
resource: pod
7883
for: condition=Ready
7984
timeout: 25m
85+
8086
verify:
8187
retry:
8288
count: 20
@@ -87,12 +93,14 @@ verify:
8793
# INTENTIONAL FAILURE — remove after verification
8894
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL
8995
expected: ../../expected-intentional-fail.yml
96+
9097
cleanup:
9198
on: always
9299
collect:
93100
on: failure
94101
output-dir: $SW_INFRA_E2E_LOG_DIR/banyandb-data
95102
items:
103+
- namespace: istio-system
96104
label-selector: app.kubernetes.io/name=banyandb
97105
paths:
98106
- /tmp/trace/

0 commit comments

Comments
 (0)