[skywalking-satellite] branch main updated: Fix e2e (#61)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liuhan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git


The following commit(s) were added to refs/heads/main by this push:
     new 4fcdb5c  Fix e2e (#61)
4fcdb5c is described below

commit 4fcdb5c29486c1a3065047f72aed112963c1da4c
Author: mrproliu <74...@qq.com>
AuthorDate: Sat Aug 21 23:56:44 2021 +0800

    Fix e2e (#61)
---
 .github/workflows/e2e.yaml              |  2 +-
 test/e2e/case/native-protocols/e2e.yaml | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 387981c..63eaeb1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -29,6 +29,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: apache/skywalking-infra-e2e@de5be41596f27867a15ab75dbad97ea538d863b8
+      - uses: apache/skywalking-infra-e2e@7d55a252c35bf69f65dc64675a80699dc3c21bde
         with:
           e2e-file: test/e2e/case/native-protocols/e2e.yaml
diff --git a/test/e2e/case/native-protocols/e2e.yaml b/test/e2e/case/native-protocols/e2e.yaml
index fba4c08..a5f3e34 100644
--- a/test/e2e/case/native-protocols/e2e.yaml
+++ b/test/e2e/case/native-protocols/e2e.yaml
@@ -20,6 +20,29 @@ setup:
   file: docker-compose.yml
   timeout: 1200
   steps:
+    - name: install yq
+      command: |
+        if ! command -v yq &> /dev/null; then
+          mkdir -p /tmp/skywalking-infra-e2e/bin && cd /tmp/skywalking-infra-e2e
+          mkdir -p yq && cd yq
+          curl -kLo yq.tar.gz https://github.com/mikefarah/yq/archive/v4.11.1.tar.gz
+          tar -zxf yq.tar.gz --strip=1
+          go install && go build -ldflags -s && mv yq ../bin/yq
+          export PATH="$PATH:/tmp/skywalking-infra-e2e/bin"
+          echo "success to install yq"
+        fi
+    - name: install swctl
+      command: |
+        if ! command -v swctl &> /dev/null; then
+          mkdir -p /tmp/skywalking-infra-e2e/bin && cd /tmp/skywalking-infra-e2e
+          mkdir -p swctl && cd swctl
+          curl -kLo skywalking-cli.tar.gz https://github.com/apache/skywalking-cli/archive/4d1cb83e24ff58988f4aba0daa50259593b11670.tar.gz
+          tar -zxf skywalking-cli.tar.gz --strip=1
+          utype=$(uname | awk '{print tolower($0)}')
+          make $utype && mv bin/swctl-*-$utype-amd64 ../bin/swctl
+          export PATH="$PATH:/tmp/skywalking-infra-e2e/bin"
+          echo "success to install swctl"
+        fi
     - name: install etcdctl
       command: |
         if ! command -v etcdctl &> /dev/null; then