This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
The following commit(s) were added to refs/heads/main by this push:
new 2943f22 Reduce GHA E2E start up time (#39)
2943f22 is described below
commit 2943f227a33a22a7c280fe58a167bf68b623c240
Author: mrproliu <[email protected]>
AuthorDate: Mon Aug 23 22:33:07 2021 +0800
Reduce GHA E2E start up time (#39)
---
Dockerfile | 10 +---------
docker/action.yaml | 36 ------------------------------------
2 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 26cc33c..b0975ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,16 +26,8 @@ RUN make linux
FROM golang:1.16 AS bin
-RUN apt update; \
- apt install -y docker-compose
-
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
-
WORKDIR /github/workspace/
-ENTRYPOINT ["e2e"]
+ENTRYPOINT ["e2e"]
\ No newline at end of file
diff --git a/docker/action.yaml b/docker/action.yaml
deleted file mode 100644
index 3ac0099..0000000
--- a/docker/action.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: SkyWalking Infra E2E Dockerized
-description: End-to-End Tesing framework that help to set up, verify E2E tests.
-author: Apache SkyWalking
-inputs:
- e2e-file:
- description: File path of e2e file
- required: true
-
-runs:
- using: "composite"
- steps:
- - shell: bash
- run: make -C $GITHUB_ACTION_PATH/.. docker
- - shell: bash
- run: |
- printenv > env.list
- docker run -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
- -v /var/run/docker.sock:/var/run/docker.sock \
- -w $GITHUB_WORKSPACE --env-file env.list \
- docker.io/apache/e2e:latest run -c "${{ inputs.e2e-file }}"
