This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 178844e Add istio 1.13.1 to test matrix for verification (#8585)
178844e is described below
commit 178844e24e3ae9f221a096782e29f20b87d7f515
Author: kezhenxu94 <[email protected]>
AuthorDate: Sat Feb 26 13:25:33 2022 +0800
Add istio 1.13.1 to test matrix for verification (#8585)
---
.github/workflows/e2e.istio.yaml | 4 +-
CHANGES.md | 1 +
test/e2e-v2/cases/alarm/es/e2e.yaml | 2 +
test/e2e-v2/cases/alarm/h2/e2e.yaml | 2 +
test/e2e-v2/cases/alarm/influxdb/e2e.yaml | 2 +
test/e2e-v2/cases/alarm/iotdb/e2e.yaml | 2 +
test/e2e-v2/cases/alarm/mysql/e2e.yaml | 2 +
test/e2e-v2/cases/alarm/postgres/e2e.yaml | 2 +
test/e2e-v2/cases/browser/e2e.yaml | 2 +
test/e2e-v2/cases/cluster/zk/es/e2e.yaml | 2 +
test/e2e-v2/cases/event/es/e2e.yaml | 2 +
test/e2e-v2/cases/event/h2/e2e.yaml | 2 +
test/e2e-v2/cases/event/influxdb/e2e.yaml | 2 +
test/e2e-v2/cases/event/iotdb/e2e.yaml | 2 +
test/e2e-v2/cases/event/mysql/e2e.yaml | 2 +
test/e2e-v2/cases/gateway/e2e.yaml | 2 +
test/e2e-v2/cases/go/e2e.yaml | 2 +
test/e2e-v2/cases/istio/als/e2e.yaml | 2 +
.../cases/istio/als/expected/service-instance.yml | 1 +
test/e2e-v2/cases/istio/als/expected/service.yml | 44 +++++++++++++++++-----
test/e2e-v2/cases/istio/metrics/e2e.yaml | 4 +-
.../istio/metrics/expected/service-instance.yml | 2 +-
.../cases/istio/metrics/expected/service.yml | 12 +++---
test/e2e-v2/cases/kafka/log/e2e.yaml | 2 +
test/e2e-v2/cases/kafka/meter/e2e.yaml | 2 +
test/e2e-v2/cases/kafka/profile/e2e.yaml | 2 +
test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml | 2 +
test/e2e-v2/cases/log/es/e2e.yaml | 2 +
test/e2e-v2/cases/log/fluent-bit/e2e.yaml | 2 +
test/e2e-v2/cases/log/h2/e2e.yaml | 2 +
test/e2e-v2/cases/log/influxdb/e2e.yaml | 2 +
test/e2e-v2/cases/log/iotdb/e2e.yaml | 2 +
test/e2e-v2/cases/log/mysql/e2e.yaml | 2 +
test/e2e-v2/cases/log/postgres/e2e.yaml | 2 +
test/e2e-v2/cases/lua/e2e.yaml | 2 +
test/e2e-v2/cases/meter/e2e.yaml | 2 +
test/e2e-v2/cases/nodejs/e2e.yaml | 2 +
test/e2e-v2/cases/php/e2e.yaml | 2 +
test/e2e-v2/cases/profile/es/e2e.yaml | 2 +
test/e2e-v2/cases/profile/h2/e2e.yaml | 2 +
test/e2e-v2/cases/profile/influxdb/e2e.yaml | 2 +
test/e2e-v2/cases/profile/iotdb/e2e.yaml | 2 +
test/e2e-v2/cases/profile/mysql/e2e.yaml | 2 +
test/e2e-v2/cases/python/e2e.yaml | 2 +
.../cases/satellite/native-protocols/e2e.yaml | 2 +
test/e2e-v2/cases/simple/auth/e2e.yaml | 2 +
test/e2e-v2/cases/simple/jdk/e2e.yaml | 2 +
test/e2e-v2/cases/simple/mtls/e2e.yaml | 2 +
test/e2e-v2/cases/simple/ssl/e2e.yaml | 2 +
test/e2e-v2/cases/so11y/e2e.yaml | 3 +-
test/e2e-v2/cases/storage/es/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/h2/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/influxdb/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/iotdb/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/mysql/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/opensearch/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/postgres/e2e.yaml | 4 +-
test/e2e-v2/cases/storage/tidb/e2e.yaml | 4 +-
test/e2e-v2/cases/ttl/es/e2e.yaml | 2 +
test/e2e-v2/cases/ttl/influxdb/e2e.yaml | 2 +
test/e2e-v2/cases/ttl/iotdb/e2e.yaml | 2 +
test/e2e-v2/cases/ttl/postgresql/e2e.yaml | 2 +
test/e2e-v2/cases/ttl/tidb/e2e.yaml | 2 +
.../cases/vm/prometheus-node-exporter/e2e.yaml | 2 +
test/e2e-v2/cases/vm/zabbix/e2e.yaml | 2 +
.../script/prepare/setup-e2e-shell/install-helm.sh | 3 +-
.../prepare/setup-e2e-shell/install-istioctl.sh | 2 +-
.../script/prepare/setup-e2e-shell/install.sh | 6 +--
68 files changed, 177 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml
index b1673f8..de5a4e4 100644
--- a/.github/workflows/e2e.istio.yaml
+++ b/.github/workflows/e2e.istio.yaml
@@ -41,7 +41,7 @@ jobs:
fail-fast: true
matrix:
analyzer: [ k8s-mesh, mx-mesh ]
- istio_version: &istio-versions [ 1.7.1, 1.8.2, 1.9.1, 1.10.3, 1.11.4,
1.12.0 ]
+ istio_version: [ 1.7.1, 1.8.2, 1.9.1, 1.10.3, 1.11.4, 1.12.0, 1.13.1 ]
name: Istio(${{ matrix.istio_version }})+ALS(${{ matrix.analyzer }})
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
@@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- istio_version: *istio-versions
+ istio_version: [ 1.8.2, 1.9.1, 1.10.3, 1.11.4, 1.12.0, 1.13.1 ]
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
steps:
diff --git a/CHANGES.md b/CHANGES.md
index 00c352f..744603d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Release Notes.
* Migrate base Docker image to eclipse-temurin as adoptopenjdk is deprecated.
* Add E2E test under Java 17.
* Upgrade protoc to 3.19.2.
+* Add Istio 1.13.1 to E2E test matrix for verification.
#### OAP Server
diff --git a/test/e2e-v2/cases/alarm/es/e2e.yaml
b/test/e2e-v2/cases/alarm/es/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/es/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/alarm/h2/e2e.yaml
b/test/e2e-v2/cases/alarm/h2/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/h2/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/h2/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
b/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/alarm/iotdb/e2e.yaml
b/test/e2e-v2/cases/alarm/iotdb/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/alarm/mysql/e2e.yaml
b/test/e2e-v2/cases/alarm/mysql/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/mysql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/alarm/postgres/e2e.yaml
b/test/e2e-v2/cases/alarm/postgres/e2e.yaml
index a44a76b..e0ad564 100644
--- a/test/e2e-v2/cases/alarm/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/postgres/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/browser/e2e.yaml
b/test/e2e-v2/cases/browser/e2e.yaml
index 9d871fd..2c76f66 100644
--- a/test/e2e-v2/cases/browser/e2e.yaml
+++ b/test/e2e-v2/cases/browser/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
b/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
index 98fd730..4ac2259 100644
--- a/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../../script/env
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
diff --git a/test/e2e-v2/cases/event/es/e2e.yaml
b/test/e2e-v2/cases/event/es/e2e.yaml
index fe22de0..c957da2 100644
--- a/test/e2e-v2/cases/event/es/e2e.yaml
+++ b/test/e2e-v2/cases/event/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/event/h2/e2e.yaml
b/test/e2e-v2/cases/event/h2/e2e.yaml
index fe22de0..c957da2 100644
--- a/test/e2e-v2/cases/event/h2/e2e.yaml
+++ b/test/e2e-v2/cases/event/h2/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/event/influxdb/e2e.yaml
b/test/e2e-v2/cases/event/influxdb/e2e.yaml
index fe22de0..c957da2 100644
--- a/test/e2e-v2/cases/event/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/event/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/event/iotdb/e2e.yaml
b/test/e2e-v2/cases/event/iotdb/e2e.yaml
index fe22de0..c957da2 100644
--- a/test/e2e-v2/cases/event/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/event/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/event/mysql/e2e.yaml
b/test/e2e-v2/cases/event/mysql/e2e.yaml
index fe22de0..c957da2 100644
--- a/test/e2e-v2/cases/event/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/event/mysql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/gateway/e2e.yaml
b/test/e2e-v2/cases/gateway/e2e.yaml
index c60fdb0..0dba2a5 100644
--- a/test/e2e-v2/cases/gateway/e2e.yaml
+++ b/test/e2e-v2/cases/gateway/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/go/e2e.yaml b/test/e2e-v2/cases/go/e2e.yaml
index b61669b..fca42ec 100644
--- a/test/e2e-v2/cases/go/e2e.yaml
+++ b/test/e2e-v2/cases/go/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/istio/als/e2e.yaml
b/test/e2e-v2/cases/istio/als/e2e.yaml
index 7c5b8b8..f0be0ce 100644
--- a/test/e2e-v2/cases/istio/als/e2e.yaml
+++ b/test/e2e-v2/cases/istio/als/e2e.yaml
@@ -28,6 +28,8 @@ setup:
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
diff --git a/test/e2e-v2/cases/istio/als/expected/service-instance.yml
b/test/e2e-v2/cases/istio/als/expected/service-instance.yml
index 658cdbd..d862389 100644
--- a/test/e2e-v2/cases/istio/als/expected/service-instance.yml
+++ b/test/e2e-v2/cases/istio/als/expected/service-instance.yml
@@ -19,4 +19,5 @@
attributes: []
language: UNKNOWN
instanceuuid: {{ notEmpty .instanceuuid }}
+ layer: MESH
{{- end }}
diff --git a/test/e2e-v2/cases/istio/als/expected/service.yml
b/test/e2e-v2/cases/istio/als/expected/service.yml
index ba6d14b..35aa6d7 100644
--- a/test/e2e-v2/cases/istio/als/expected/service.yml
+++ b/test/e2e-v2/cases/istio/als/expected/service.yml
@@ -14,22 +14,46 @@
# limitations under the License.
{{- contains . }}
-- id: {{ b64enc "e2e::istio-ingressgateway" }}.1
- name: e2e::istio-ingressgateway
- group: ""
+- id: {{ b64enc "e2e::details" }}.1
+ name: e2e::details
+ group: "e2e"
+ shortname: details
+ layers:
+ - MESH
+ normal: true
- id: {{ b64enc "e2e::reviews" }}.1
name: e2e::reviews
- group: ""
+ group: "e2e"
+ shortname: reviews
+ layers:
+ - MESH
+ normal: true
+- id: {{ b64enc "e2e::istio-ingressgateway" }}.1
+ name: e2e::istio-ingressgateway
+ group: "e2e"
+ shortname: istio-ingressgateway
+ layers:
+ - MESH
+ normal: true
- id: {{ b64enc "e2e::ratings" }}.1
name: e2e::ratings
- group: ""
+ group: "e2e"
+ shortname: ratings
+ layers:
+ - MESH
+ normal: true
- id: {{ b64enc "e2e::productpage" }}.1
name: e2e::productpage
- group: ""
-- id: {{ b64enc "e2e::details" }}.1
- name: e2e::details
- group: ""
+ group: "e2e"
+ shortname: productpage
+ layers:
+ - MESH
+ normal: true
- id: {{ b64enc "e2e::mongodb" }}.1
name: e2e::mongodb
- group: ""
+ group: "e2e"
+ shortname: mongodb
+ layers:
+ - MESH
+ normal: true
{{- end }}
diff --git a/test/e2e-v2/cases/istio/metrics/e2e.yaml
b/test/e2e-v2/cases/istio/metrics/e2e.yaml
index 92503bc..90f397c 100644
--- a/test/e2e-v2/cases/istio/metrics/e2e.yaml
+++ b/test/e2e-v2/cases/istio/metrics/e2e.yaml
@@ -28,6 +28,8 @@ setup:
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
@@ -210,4 +212,4 @@ verify:
# dependency service
- query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
dependency service --service-name=e2e::productpage
- expected: expected/dependency-services-productpage.yml
\ No newline at end of file
+ expected: expected/dependency-services-productpage.yml
diff --git a/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml
b/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml
index 05b3ccd..b8e3c0f 100644
--- a/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml
+++ b/test/e2e-v2/cases/istio/metrics/expected/service-instance.yml
@@ -19,5 +19,5 @@
attributes: []
language: UNKNOWN
instanceuuid: {{ notEmpty .instanceuuid }}
- layer: GENERAL
+ layer: MESH_DP
{{- end }}
diff --git a/test/e2e-v2/cases/istio/metrics/expected/service.yml
b/test/e2e-v2/cases/istio/metrics/expected/service.yml
index 918072d..cebb94e 100644
--- a/test/e2e-v2/cases/istio/metrics/expected/service.yml
+++ b/test/e2e-v2/cases/istio/metrics/expected/service.yml
@@ -20,40 +20,40 @@
shortname: e2e::istio-egressgateway
normal: true
layers:
- - GENERAL
+ - MESH_DP
- id: {{ b64enc "istio-dp::e2e::istio-ingressgateway" }}.1
name: istio-dp::e2e::istio-ingressgateway
group: "istio-dp"
shortname: e2e::istio-ingressgateway
normal: true
layers:
- - GENERAL
+ - MESH_DP
- id: {{ b64enc "istio-dp::e2e::reviews" }}.1
name: istio-dp::e2e::reviews
group: "istio-dp"
shortname: e2e::reviews
normal: true
layers:
- - GENERAL
+ - MESH_DP
- id: {{ b64enc "istio-dp::e2e::productpage" }}.1
name: istio-dp::e2e::productpage
group: "istio-dp"
shortname: e2e::productpage
normal: true
layers:
- - GENERAL
+ - MESH_DP
- id: {{ b64enc "istio-dp::e2e::details" }}.1
name: istio-dp::e2e::details
group: "istio-dp"
shortname: e2e::details
normal: true
layers:
- - GENERAL
+ - MESH_DP
- id: {{ b64enc "istio-dp::e2e::ratings" }}.1
name: istio-dp::e2e::ratings
group: "istio-dp"
shortname: e2e::ratings
normal: true
layers:
- - GENERAL
+ - MESH_DP
{{- end }}
diff --git a/test/e2e-v2/cases/kafka/log/e2e.yaml
b/test/e2e-v2/cases/kafka/log/e2e.yaml
index 8ab4bbf..e2ea817 100644
--- a/test/e2e-v2/cases/kafka/log/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/log/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/kafka/meter/e2e.yaml
b/test/e2e-v2/cases/kafka/meter/e2e.yaml
index 398897d..ca7a520 100644
--- a/test/e2e-v2/cases/kafka/meter/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/meter/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/kafka/profile/e2e.yaml
b/test/e2e-v2/cases/kafka/profile/e2e.yaml
index f4fcec3..8c3f7c0 100644
--- a/test/e2e-v2/cases/kafka/profile/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/profile/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
b/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
index 0c9d3b4..fcfce60 100644
--- a/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/es/e2e.yaml
b/test/e2e-v2/cases/log/es/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/es/e2e.yaml
+++ b/test/e2e-v2/cases/log/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
b/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
+++ b/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/h2/e2e.yaml
b/test/e2e-v2/cases/log/h2/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/h2/e2e.yaml
+++ b/test/e2e-v2/cases/log/h2/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/influxdb/e2e.yaml
b/test/e2e-v2/cases/log/influxdb/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/log/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/iotdb/e2e.yaml
b/test/e2e-v2/cases/log/iotdb/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/log/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/mysql/e2e.yaml
b/test/e2e-v2/cases/log/mysql/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/log/mysql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/log/postgres/e2e.yaml
b/test/e2e-v2/cases/log/postgres/e2e.yaml
index 1edeacf..e474fbb 100644
--- a/test/e2e-v2/cases/log/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/log/postgres/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/lua/e2e.yaml b/test/e2e-v2/cases/lua/e2e.yaml
index 976d6ba..540aa19 100644
--- a/test/e2e-v2/cases/lua/e2e.yaml
+++ b/test/e2e-v2/cases/lua/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/meter/e2e.yaml b/test/e2e-v2/cases/meter/e2e.yaml
index ad8f557..46780e7 100644
--- a/test/e2e-v2/cases/meter/e2e.yaml
+++ b/test/e2e-v2/cases/meter/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/nodejs/e2e.yaml
b/test/e2e-v2/cases/nodejs/e2e.yaml
index dfeddd2..9b45c51 100644
--- a/test/e2e-v2/cases/nodejs/e2e.yaml
+++ b/test/e2e-v2/cases/nodejs/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/php/e2e.yaml b/test/e2e-v2/cases/php/e2e.yaml
index 6f7a7f8..f0727a1 100644
--- a/test/e2e-v2/cases/php/e2e.yaml
+++ b/test/e2e-v2/cases/php/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/profile/es/e2e.yaml
b/test/e2e-v2/cases/profile/es/e2e.yaml
index 107ef28..d73067a 100644
--- a/test/e2e-v2/cases/profile/es/e2e.yaml
+++ b/test/e2e-v2/cases/profile/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/profile/h2/e2e.yaml
b/test/e2e-v2/cases/profile/h2/e2e.yaml
index 107ef28..d73067a 100644
--- a/test/e2e-v2/cases/profile/h2/e2e.yaml
+++ b/test/e2e-v2/cases/profile/h2/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/profile/influxdb/e2e.yaml
b/test/e2e-v2/cases/profile/influxdb/e2e.yaml
index 107ef28..d73067a 100644
--- a/test/e2e-v2/cases/profile/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/profile/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/profile/iotdb/e2e.yaml
b/test/e2e-v2/cases/profile/iotdb/e2e.yaml
index 107ef28..d73067a 100644
--- a/test/e2e-v2/cases/profile/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/profile/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/profile/mysql/e2e.yaml
b/test/e2e-v2/cases/profile/mysql/e2e.yaml
index 107ef28..d73067a 100644
--- a/test/e2e-v2/cases/profile/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/profile/mysql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/python/e2e.yaml
b/test/e2e-v2/cases/python/e2e.yaml
index c57e65e..55209cd 100644
--- a/test/e2e-v2/cases/python/e2e.yaml
+++ b/test/e2e-v2/cases/python/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
diff --git a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
index 4fb4c7c..699273c 100644
--- a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
+++ b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/simple/auth/e2e.yaml
b/test/e2e-v2/cases/simple/auth/e2e.yaml
index e07a456..ea34c28 100644
--- a/test/e2e-v2/cases/simple/auth/e2e.yaml
+++ b/test/e2e-v2/cases/simple/auth/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/simple/jdk/e2e.yaml
b/test/e2e-v2/cases/simple/jdk/e2e.yaml
index e07a456..ea34c28 100644
--- a/test/e2e-v2/cases/simple/jdk/e2e.yaml
+++ b/test/e2e-v2/cases/simple/jdk/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/simple/mtls/e2e.yaml
b/test/e2e-v2/cases/simple/mtls/e2e.yaml
index e07a456..ea34c28 100644
--- a/test/e2e-v2/cases/simple/mtls/e2e.yaml
+++ b/test/e2e-v2/cases/simple/mtls/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/simple/ssl/e2e.yaml
b/test/e2e-v2/cases/simple/ssl/e2e.yaml
index e07a456..ea34c28 100644
--- a/test/e2e-v2/cases/simple/ssl/e2e.yaml
+++ b/test/e2e-v2/cases/simple/ssl/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/so11y/e2e.yaml b/test/e2e-v2/cases/so11y/e2e.yaml
index 6185f90..fae4ea7 100644
--- a/test/e2e-v2/cases/so11y/e2e.yaml
+++ b/test/e2e-v2/cases/so11y/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../script/env
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
@@ -44,4 +46,3 @@ verify:
- includes:
- so11y-cases.yaml
- satellite-cases.yaml
-
diff --git a/test/e2e-v2/cases/storage/es/e2e.yaml
b/test/e2e-v2/cases/storage/es/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/es/e2e.yaml
+++ b/test/e2e-v2/cases/storage/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/h2/e2e.yaml
b/test/e2e-v2/cases/storage/h2/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/h2/e2e.yaml
+++ b/test/e2e-v2/cases/storage/h2/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/influxdb/e2e.yaml
b/test/e2e-v2/cases/storage/influxdb/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/iotdb/e2e.yaml
b/test/e2e-v2/cases/storage/iotdb/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/mysql/e2e.yaml
b/test/e2e-v2/cases/storage/mysql/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/storage/mysql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/opensearch/e2e.yaml
b/test/e2e-v2/cases/storage/opensearch/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/opensearch/e2e.yaml
+++ b/test/e2e-v2/cases/storage/opensearch/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/postgres/e2e.yaml
b/test/e2e-v2/cases/storage/postgres/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/storage/postgres/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/storage/tidb/e2e.yaml
b/test/e2e-v2/cases/storage/tidb/e2e.yaml
index 7255ea3..12b86b8 100644
--- a/test/e2e-v2/cases/storage/tidb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/tidb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
@@ -42,4 +44,4 @@ verify:
interval: 10s
cases:
- includes:
- - ../storage-cases.yaml
\ No newline at end of file
+ - ../storage-cases.yaml
diff --git a/test/e2e-v2/cases/ttl/es/e2e.yaml
b/test/e2e-v2/cases/ttl/es/e2e.yaml
index 3793093..b8fc6ed 100644
--- a/test/e2e-v2/cases/ttl/es/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/es/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
b/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
index 3793093..b8fc6ed 100644
--- a/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/ttl/iotdb/e2e.yaml
b/test/e2e-v2/cases/ttl/iotdb/e2e.yaml
index 3793093..b8fc6ed 100644
--- a/test/e2e-v2/cases/ttl/iotdb/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/iotdb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
b/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
index 3793093..b8fc6ed 100644
--- a/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/ttl/tidb/e2e.yaml
b/test/e2e-v2/cases/ttl/tidb/e2e.yaml
index 3793093..b8fc6ed 100644
--- a/test/e2e-v2/cases/ttl/tidb/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/tidb/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
index 2bb50d1..75ba57c 100644
--- a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
+++ b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/cases/vm/zabbix/e2e.yaml
b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
index 3c031ae..2ebc92c 100644
--- a/test/e2e-v2/cases/vm/zabbix/e2e.yaml
+++ b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
@@ -21,6 +21,8 @@ setup:
timeout: 20m
init-system-environment: ../../../script/env
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
diff --git a/test/e2e-v2/script/prepare/setup-e2e-shell/install-helm.sh
b/test/e2e-v2/script/prepare/setup-e2e-shell/install-helm.sh
index 197f888..2d53f8f 100644
--- a/test/e2e-v2/script/prepare/setup-e2e-shell/install-helm.sh
+++ b/test/e2e-v2/script/prepare/setup-e2e-shell/install-helm.sh
@@ -25,6 +25,5 @@ HELMVERSION=${HELMVERSION:-'helm-v3.0.0'}
if ! command -v helm &> /dev/null; then
mkdir -p $BASE_DIR/helm && cd $BASE_DIR/helm
- curl -sSL https://get.helm.sh/${HELMVERSION}-linux-amd64.tar.gz
- tar xz -C $BIN_DIR --strip-components=1 linux-amd64/helm
+ curl -sSL https://get.helm.sh/${HELMVERSION}-linux-amd64.tar.gz | tar xz -C
$BIN_DIR --strip-components=1 linux-amd64/helm
fi
\ No newline at end of file
diff --git a/test/e2e-v2/script/prepare/setup-e2e-shell/install-istioctl.sh
b/test/e2e-v2/script/prepare/setup-e2e-shell/install-istioctl.sh
index 166ea50..bf9ff11 100644
--- a/test/e2e-v2/script/prepare/setup-e2e-shell/install-istioctl.sh
+++ b/test/e2e-v2/script/prepare/setup-e2e-shell/install-istioctl.sh
@@ -25,5 +25,5 @@ BIN_DIR=$2
if ! command -v istioctl &> /dev/null; then
mkdir -p $BASE_DIR/istioctl && cd $BASE_DIR/istioctl
curl -L https://istio.io/downloadIstio | sh -
- cp istio-$ISTIO_VERSION/bin/istioctl $BIN_DIR
+ cp istio-$ISTIO_VERSION/bin/istioctl $BIN_DIR/istioctl
fi
\ No newline at end of file
diff --git a/test/e2e-v2/script/prepare/setup-e2e-shell/install.sh
b/test/e2e-v2/script/prepare/setup-e2e-shell/install.sh
index 3d440fa..8a5ed1a 100644
--- a/test/e2e-v2/script/prepare/setup-e2e-shell/install.sh
+++ b/test/e2e-v2/script/prepare/setup-e2e-shell/install.sh
@@ -26,10 +26,10 @@ CURRENT_DIR="$(cd "$(dirname $0)"; pwd)"
# prepare base dir
TMP_DIR=/tmp/skywalking-infra-e2e
-BIN_DIR=/usr/local/bin
-mkdir -p $TMP_DIR && cd $TMP_DIR
+BIN_DIR=$TMP_DIR/bin
+mkdir -p $TMP_DIR $BIN_DIR && cd $TMP_DIR
# execute install
bash $CURRENT_DIR/install-$NAME.sh $TMP_DIR $BIN_DIR
-echo "success to install $NAME"
\ No newline at end of file
+echo "success to install $NAME"
