From 30a88b555f44c52f40345aeacd1bc3300446de89 Mon Sep 17 00:00:00 2001 From: Zhenxu Ke Date: Sun, 7 Feb 2021 16:19:55 +0800 Subject: [PATCH] Skip CI in some cases to save resources (#6340) --- .github/actions/plugins-test/action.yml | 2 +- .github/actions/skip/action.yml | 76 +++++++++++++++++++++++++ .github/workflows/ci-it.yaml | 23 ++++++++ .github/workflows/e2e.cluster.yaml | 4 ++ .github/workflows/e2e.compat.yaml | 5 ++ .github/workflows/e2e.event.yaml | 4 ++ .github/workflows/e2e.go.yaml | 4 ++ .github/workflows/e2e.istio.yaml | 31 +++++++++- .github/workflows/e2e.jdk-versions.yaml | 6 ++ .github/workflows/e2e.js.yaml | 4 ++ .github/workflows/e2e.kafka.yaml | 4 ++ .github/workflows/e2e.log.yaml | 4 ++ .github/workflows/e2e.nodejs.yaml | 4 ++ .github/workflows/e2e.php.yaml | 4 ++ .github/workflows/e2e.profiling.yaml | 4 ++ .github/workflows/e2e.python.yaml | 4 ++ .github/workflows/e2e.so11y.yaml | 4 ++ .github/workflows/e2e.storages.yaml | 4 ++ .github/workflows/e2e.ttl.yaml | 4 ++ .github/workflows/e2e.yaml | 8 +++ test/e2e/e2e-service-provider/pom.xml | 6 +- 21 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 .github/actions/skip/action.yml diff --git a/.github/actions/plugins-test/action.yml b/.github/actions/plugins-test/action.yml index f1dfa1c7b..1869e5248 100644 --- a/.github/actions/plugins-test/action.yml +++ b/.github/actions/plugins-test/action.yml @@ -43,7 +43,7 @@ runs: shell: bash run: | echo "::group::Add checkstyle plugin to the pom.xml" - sed -i "/<\/sourceDirectories>/i scenarios\/""${{ matrix.case }}""<\/sourceDirectory>" test/plugin/pom.xml + sed -i "/<\/sourceDirectories>/i scenarios\/""${{ inputs.test_case }}""<\/sourceDirectory>" test/plugin/pom.xml echo "::endgroup::" - name: Build SkyWalking Agent shell: bash diff --git a/.github/actions/skip/action.yml b/.github/actions/skip/action.yml new file mode 100644 index 000000000..e335e1e90 --- /dev/null +++ b/.github/actions/skip/action.yml @@ -0,0 +1,76 @@ +# +# 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: "Set Skip Env Var" +description: "Action to set the SKIP_CI environment variable indicating that we should skip CI jobs" +inputs: + paths: + description: >- + Set the SKIP_CI environment variable when and only when all the changed files located in one of the path, + the paths is shell-style pattern. + required: false + default: >- + "*.md" + "skywalking-ui" +runs: + using: "composite" + steps: + - name: Check Changed Files And Set Env Var + shell: bash + run: | + if [[ "${{ github.event_name }}" != "pull_request" ]]; then + exit 0 + fi + + BASE_SHA=$(jq -r '.pull_request.base.sha' $GITHUB_EVENT_PATH) + echo "Base sha is $BASE_SHA, head sha is $GITHUB_SHA" + + git fetch --no-tags --progress --recurse-submodules --depth=1 origin ${BASE_SHA}:origin/${BASE_SHA} + BASE_SHA=origin/${BASE_SHA} + echo "Base sha is $BASE_SHA, head sha is $GITHUB_SHA" + + if ! files=$(git --no-pager diff --name-only ${GITHUB_SHA} ${BASE_SHA}); then + exit 1 + fi + + echo "Ignore pattern:" + for pattern in $(echo '${{ inputs.paths }}'); do + echo $pattern + done + + echo "Changed files:" + for file in ${files}; do + echo $file + done + + echo "SKIP_CI=true" >> $GITHUB_ENV + for file in ${files}; do + matched=0 + for pattern in $(echo '${{ inputs.paths }}'); do + pattern=$(echo "$pattern" | sed 's/"//g') + if eval "[[ '$file' == $pattern ]]"; then + matched=1 + break + fi + done + if [[ "$matched" == "0" ]]; then + echo "$file doesn't match pattern $(echo '${{ inputs.paths }}'), stop checking" + echo "SKIP_CI=false" >> $GITHUB_ENV + break + fi + done diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml index db1700da0..a317881bc 100644 --- a/.github/workflows/ci-it.yaml +++ b/.github/workflows/ci-it.yaml @@ -33,11 +33,15 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Check License Header + if: env.SKIP_CI != 'true' uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -45,15 +49,19 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - uses: actions/setup-java@v1 + if: env.SKIP_CI != 'true' with: java-version: 8 - name: 'Check Javaagent Plugin List' + if: env.SKIP_CI != 'true' run: tools/plugin/check-javaagent-plugin-list.sh - name: 'Install & Test' + if: env.SKIP_CI != 'true' run: | ./mvnw --batch-mode -P"agent,backend,ui,dist,CI-with-IT" clean cobertura:cobertura verify install javadoc:javadoc bash <(curl -s https://codecov.io/bash) - name: 'Check Dependencies Licenses' + if: env.SKIP_CI != 'true' run: tools/dependencies/check-LICENSE.sh CI-on-JDK11: @@ -63,9 +71,13 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Check License Header + if: env.SKIP_CI != 'true' uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -73,9 +85,11 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - uses: actions/setup-java@v1 + if: env.SKIP_CI != 'true' with: java-version: 11 - name: 'Install & Test' + if: env.SKIP_CI != 'true' run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install CI-on-Windows: @@ -85,10 +99,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - uses: actions/setup-java@v1 + if: env.SKIP_CI != 'true' with: java-version: 8 - name: 'Install & Test' + if: env.SKIP_CI != 'true' run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install @@ -99,7 +117,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -107,9 +128,11 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - uses: actions/setup-java@v1 + if: env.SKIP_CI != 'true' with: java-version: 8 - name: 'Install & Test' + if: env.SKIP_CI != 'true' run: | # Given packaging on Mac has a high possibility to fail, we retry one more time here ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install || \ diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml index a282908dc..aed3e747f 100644 --- a/.github/workflows/e2e.cluster.yaml +++ b/.github/workflows/e2e.cluster.yaml @@ -40,7 +40,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -48,6 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.ClusterE2E diff --git a/.github/workflows/e2e.compat.yaml b/.github/workflows/e2e.compat.yaml index ef9e6b1cf..4dd253925 100644 --- a/.github/workflows/e2e.compat.yaml +++ b/.github/workflows/e2e.compat.yaml @@ -34,7 +34,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -42,10 +45,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set Up Java + if: env.SKIP_CI != 'true' uses: actions/setup-java@v1 with: java-version: 11 - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.simple.SimpleE2E diff --git a/.github/workflows/e2e.event.yaml b/.github/workflows/e2e.event.yaml index ad648c6a2..04a464f34 100644 --- a/.github/workflows/e2e.event.yaml +++ b/.github/workflows/e2e.event.yaml @@ -40,7 +40,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -48,6 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.event.EventE2E diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml index 5fe93c4c5..8c77839bd 100644 --- a/.github/workflows/e2e.go.yaml +++ b/.github/workflows/e2e.go.yaml @@ -36,7 +36,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -44,6 +47,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.GOE2E diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index bd72a5d16..a054dbbe4 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -48,25 +48,34 @@ jobs: with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip + - uses: actions/cache@v2 + if: env.SKIP_CI != 'true' with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven- - name: Build Docker Image + if: env.SKIP_CI != 'true' run: make docker - name: Prepare envrionment + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/pre.sh - name: Install Minikube + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/minikube.sh start - name: Install Istio + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/istio.sh --set profile=demo --set meshConfig.defaultConfig.envoyAccessLogService.address=skywalking-oap.istio-system:11800 --set meshConfig.enableEnvoyAccessLogService=true - name: Install SkyWalking + if: env.SKIP_CI != 'true' run: | git clone https://github.com/apache/skywalking-kubernetes.git cd skywalking-kubernetes @@ -96,6 +105,7 @@ jobs: kubectl get services -A -o wide - name: Deploy demo services + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/demo.sh - name: Cluster Info @@ -106,6 +116,7 @@ jobs: minikube status - name: Set up Minikube tunnel + if: env.SKIP_CI != 'true' run: | mkdir /tmp/minikube-tunnel minikube tunnel > /tmp/minikube-tunnel/a.log & @@ -114,6 +125,7 @@ jobs: kubectl -n istio-system port-forward $POD_NAME 8080:8080 > /tmp/minikube-tunnel/b.log & - name: Run E2E test + if: env.SKIP_CI != 'true' run: | export GATEWAY_HOST=$(minikube ip) export GATEWAY_PORT=$(kubectl -n istio-system get service istio-ingressgateway -o jsonpath='{.spec.ports[?(@.name=="http2")].nodePort}') @@ -124,13 +136,15 @@ jobs: - name: Logs if: ${{ failure() }} + continue-on-error: true run: | kubectl -n istio-system logs --tail=10000 -l "app=skywalking,release=skywalking,component=ui" kubectl -n istio-system logs --tail=10000 -l "app=skywalking,release=skywalking,component=oap" cat /tmp/minikube-tunnel/* - name: Clean up - if: ${{ always() }} + if: env.SKIP_CI != 'true' + continue-on-error: true run: minikube delete metrics-service: @@ -148,22 +162,30 @@ jobs: with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip + - uses: actions/cache@v2 + if: env.SKIP_CI != 'true' with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven- - name: Build Docker Image + if: env.SKIP_CI != 'true' run: make docker - name: Prepare envrionment + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/pre.sh - name: Install Minikube + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/minikube.sh start - name: Install Istio + if: env.SKIP_CI != 'true' run: | bash ${SCRIPTS_DIR}/istio.sh \ --set profile=demo \ @@ -171,6 +193,7 @@ jobs: --set values.telemetry.v2.enabled=false # disable the metadata-exchange extension intentionally to make sure metrics service doesn't rely on it - name: Install SkyWalking + if: env.SKIP_CI != 'true' run: | git clone https://github.com/apache/skywalking-kubernetes.git cd skywalking-kubernetes @@ -196,6 +219,7 @@ jobs: kubectl get services -A -o wide - name: Deploy demo services + if: env.SKIP_CI != 'true' run: bash ${SCRIPTS_DIR}/demo.sh - name: Cluster Info @@ -206,6 +230,7 @@ jobs: minikube status - name: Set up Minikube tunnel + if: env.SKIP_CI != 'true' run: | mkdir /tmp/minikube-tunnel minikube tunnel > /tmp/minikube-tunnel/a.log & @@ -214,6 +239,7 @@ jobs: kubectl -n istio-system port-forward $POD_NAME 8080:8080 > /tmp/minikube-tunnel/b.log & - name: Run E2E test + if: env.SKIP_CI != 'true' run: | export GATEWAY_HOST=$(minikube ip) export GATEWAY_PORT=$(kubectl -n istio-system get service istio-ingressgateway -o jsonpath='{.spec.ports[?(@.name=="http2")].nodePort}') @@ -224,11 +250,12 @@ jobs: - name: Logs if: ${{ failure() }} + continue-on-error: true run: | kubectl -n istio-system logs --tail=10000 -l "app=skywalking,release=skywalking,component=ui" kubectl -n istio-system logs --tail=10000 -l "app=skywalking,release=skywalking,component=oap" cat /tmp/minikube-tunnel/* - name: Clean up - if: ${{ always() }} + if: env.SKIP_CI != 'true' run: minikube delete diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index 383d36f47..6e40fbc7b 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -37,7 +37,11 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + depth: 0 + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -45,10 +49,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set Up Java + if: env.SKIP_CI != 'true' uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.simple.SimpleE2E diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml index f5c977691..5347ad9fe 100644 --- a/.github/workflows/e2e.js.yaml +++ b/.github/workflows/e2e.js.yaml @@ -40,7 +40,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -48,6 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.browser.BrowserE2E diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml index 0cf63b68c..efbd3ed8c 100644 --- a/.github/workflows/e2e.kafka.yaml +++ b/.github/workflows/e2e.kafka.yaml @@ -48,7 +48,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -56,6 +59,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: ${{ matrix.case.class }} diff --git a/.github/workflows/e2e.log.yaml b/.github/workflows/e2e.log.yaml index 0f5910800..66ed844b8 100644 --- a/.github/workflows/e2e.log.yaml +++ b/.github/workflows/e2e.log.yaml @@ -40,7 +40,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -48,6 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.log.LogE2E diff --git a/.github/workflows/e2e.nodejs.yaml b/.github/workflows/e2e.nodejs.yaml index 371c5dfca..823f9b472 100644 --- a/.github/workflows/e2e.nodejs.yaml +++ b/.github/workflows/e2e.nodejs.yaml @@ -36,7 +36,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -44,6 +47,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.NodeJSE2E diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml index d5af9cbd9..bf93b76c0 100644 --- a/.github/workflows/e2e.php.yaml +++ b/.github/workflows/e2e.php.yaml @@ -33,7 +33,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -41,6 +44,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.PHPE2E diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index 2c0ad7711..7b53b2d6b 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -41,7 +41,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -49,6 +52,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.profile.ProfileE2E diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml index 909d4cc35..a18d75cde 100644 --- a/.github/workflows/e2e.python.yaml +++ b/.github/workflows/e2e.python.yaml @@ -36,7 +36,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -44,6 +47,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.PythonE2E diff --git a/.github/workflows/e2e.so11y.yaml b/.github/workflows/e2e.so11y.yaml index 03bbacdc6..f9c8e95cf 100644 --- a/.github/workflows/e2e.so11y.yaml +++ b/.github/workflows/e2e.so11y.yaml @@ -36,7 +36,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -44,6 +47,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.SO11yE2E diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 791a6d115..06006407f 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -38,7 +38,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -46,6 +49,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.storage.StorageE2E diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 495588f9a..35ecbfae4 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -41,7 +41,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -49,6 +52,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.ttl.StorageTTLE2E diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0f91cf273..ff4ac0011 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -42,7 +42,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -50,6 +53,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: org.apache.skywalking.e2e.simple.SimpleE2E @@ -78,7 +82,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set Skip Env Var + uses: ./.github/actions/skip - name: Cache local Maven repository + if: env.SKIP_CI != 'true' uses: actions/cache@v2 with: path: ~/.m2/repository @@ -86,6 +93,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run E2E Test + if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: test_class: ${{ matrix.case.class }} diff --git a/test/e2e/e2e-service-provider/pom.xml b/test/e2e/e2e-service-provider/pom.xml index 94ff0b141..11892c8c3 100644 --- a/test/e2e/e2e-service-provider/pom.xml +++ b/test/e2e/e2e-service-provider/pom.xml @@ -34,7 +34,7 @@ e2e-service-provider - 8.4.0-SNAPSHOT + 8.4.0 @@ -60,12 +60,12 @@ org.apache.skywalking apm-toolkit-logback-1.x - ${sw.snapshot.version} + ${sw.version} org.apache.skywalking apm-toolkit-trace - ${sw.snapshot.version} + ${sw.version}