[skywalking-infra-e2e] branch native-mode updated (bbea184 -> 41a3823)

[ke...@apache.org]

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

kezhenxu94 pushed a change to branch native-mode
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git.


 discard bbea184  Use native executable instead of Docker container in GHA
     new 41a3823  Use native executable instead of Docker container in GHA

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bbea184)
            \
             N -- N -- N   refs/heads/native-mode (41a3823)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

[skywalking-infra-e2e] 01/01: Use native executable instead of Docker container in GHA

[ke...@apache.org]

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

kezhenxu94 pushed a commit to branch native-mode
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git

commit 41a38235c91d6583a611ebc35ab998b61e686fd2
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Aug 20 13:57:59 2021 +0800

    Use native executable instead of Docker container in GHA
---
 Dockerfile  | 32 ++------------------------------
 action.yaml | 11 +++++------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03f2af5..e4b82df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,24 +16,7 @@
 # under the License.
 #
 
-FROM golang:1.16 AS swctl
-
-ARG COMMIT_HASH=master
-ARG CLI_CODE=${COMMIT_HASH}.tar.gz
-ARG CLI_CODE_URL=https://github.com/apache/skywalking-cli/archive/${CLI_CODE}
-
-ENV CGO_ENABLED=0
-ENV GO111MODULE=on
-
-WORKDIR /cli
-
-ADD ${CLI_CODE_URL} .
-RUN tar -xf ${CLI_CODE} --strip 1
-RUN rm ${CLI_CODE}
-
-RUN VERSION=ci make linux && mv bin/swctl-ci-linux-amd64 /usr/local/bin/swctl
-
-FROM golang:1.16 AS build
+FROM golang:1.16
 
 WORKDIR /e2e
 
@@ -41,18 +24,7 @@ COPY . .
 
 RUN make linux
 
-FROM golang:1.16 AS bin
-
-RUN apt update; \
-    apt install -y docker-compose
-
-COPY --from=swctl /usr/local/bin/swctl /usr/local/bin/swctl
-COPY --from=build /e2e/bin/linux/e2e /usr/local/bin/e2e
-
-# Add common tools, copy from prebuilt Docker image whenever possible.
-COPY --from=stedolan/jq /usr/local/bin/jq /usr/local/bin/jq
-COPY --from=mikefarah/yq:4 /usr/bin/yq /usr/local/bin/yq
-COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker
+RUN cp /e2e/bin/linux/e2e /usr/local/bin/e2e
 
 WORKDIR /github/workspace/
 
diff --git a/action.yaml b/action.yaml
index 0ced170..5fc5317 100644
--- a/action.yaml
+++ b/action.yaml
@@ -26,10 +26,9 @@ runs:
   using: "composite"
   steps:
     - shell: bash
-      run: make -C $GITHUB_ACTION_PATH docker
-    - shell: bash
       run: |
-        docker run -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-                   -v /var/run/docker.sock:/var/run/docker.sock \
-                   -w $GITHUB_WORKSPACE \
-                   docker.io/apache/e2e:latest run -c "${{ inputs.e2e-file }}"
+        make -C $GITHUB_ACTION_PATH docker
+        docker run -v $(pwd):/tmp -w /tmp --entrypoint=sh docker.io/apache/e2e:latest -c "cp /usr/local/bin/e2e /tmp/e2e"
+        install ./e2e
+    - shell: bash
+      run: e2e run -c "${{ inputs.e2e-file }}"