You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/11/22 10:43:58 UTC
[skywalking] 01/01: Clean up CI settings and add missing Istio versions to metrics service tests
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch ci/polish
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit c1a1af162c859cd9d093c3325a315e822af9fd02
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Nov 22 18:42:15 2021 +0800
Clean up CI settings and add missing Istio versions to metrics service tests
- Clean up the settings via leveraging the `if` condition in composite
GHA, introduced recently.
- Also remove docker-ci.yaml as we already use the Docker images in all
E2E tests so there is no need to verify the Docker images separately.
---
.github/actions/infra-e2e-test/action.yml | 20 +++++--
.github/workflows/docker-ci.yaml | 95 -------------------------------
.github/workflows/e2e.alarm.yaml | 3 -
.github/workflows/e2e.cluster.yaml | 3 -
.github/workflows/e2e.event.yaml | 3 -
.github/workflows/e2e.go.yaml | 3 -
.github/workflows/e2e.istio.yaml | 12 +---
.github/workflows/e2e.jdk-versions.yaml | 4 --
.github/workflows/e2e.js.yaml | 5 +-
.github/workflows/e2e.kafka.yaml | 3 -
.github/workflows/e2e.log.yaml | 3 -
.github/workflows/e2e.nodejs.yaml | 3 -
.github/workflows/e2e.php.yaml | 3 -
.github/workflows/e2e.profiling.yaml | 3 -
.github/workflows/e2e.python.yaml | 3 -
.github/workflows/e2e.satellite.yaml | 5 +-
.github/workflows/e2e.so11y.yaml | 3 -
.github/workflows/e2e.storages.yaml | 5 +-
.github/workflows/e2e.ttl.yaml | 3 -
.github/workflows/e2e.yaml | 3 -
20 files changed, 20 insertions(+), 165 deletions(-)
diff --git a/.github/actions/infra-e2e-test/action.yml b/.github/actions/infra-e2e-test/action.yml
index 9645852..68f6833 100644
--- a/.github/actions/infra-e2e-test/action.yml
+++ b/.github/actions/infra-e2e-test/action.yml
@@ -25,16 +25,21 @@ inputs:
runs:
using: "composite"
steps:
- - name: Cache local Maven repository
+ - name: Set Skip Env Var
+ uses: ./.github/actions/skip
+ - if: env.SKIP_CI != 'true'
+ name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Check License
+ - if: env.SKIP_CI != 'true'
+ name: Check License
uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f
- - name: Build Docker Image
+ - if: env.SKIP_CI != 'true'
+ name: Build Docker Image
shell: bash
env:
SKIP_TEST: "true"
@@ -43,18 +48,21 @@ runs:
# Retry one more time due to frequent "maven connection reset"
make docker || make docker
echo "::endgroup::"
- - name: Build Java Test Services
+ - if: env.SKIP_CI != 'true'
+ name: Build Java Test Services
shell: bash
run: |
echo "::group::build java test services"
# Retry one more time due to frequent "maven connection reset"
./mvnw --batch-mode -f test/e2e-v2/java-test-service/pom.xml clean package
echo "::endgroup::"
- - name: Setup go
+ - if: env.SKIP_CI != 'true'
+ name: Setup go
uses: actions/setup-go@v2
with:
go-version: '1.16'
- - name: Run E2E Test
+ - if: env.SKIP_CI != 'true'
+ name: Run E2E Test
uses: apache/skywalking-infra-e2e@main
with:
e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/${{ inputs.config-file }}
diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
deleted file mode 100644
index 202a01e0..0000000
--- a/.github/workflows/docker-ci.yaml
+++ /dev/null
@@ -1,95 +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: docker-ci
-
-on:
- pull_request:
- paths:
- - '**'
- - '!**.md'
- schedule:
- - cron: '0 18 * * *'
-
-concurrency:
- group: docker-ci-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-env:
- SKIP_TEST: true
- DOCKER_DIR: ./docker
- LOG_DIR: /tmp/skywalking
-jobs:
- build:
- if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- fail-fast: true
- matrix:
- es: [es6, es7]
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - uses: actions/cache@v1
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: Build docker image
- run: make docker || make docker
- - name: Bootstrap cluster
- run: |
- case ${{ matrix.es }} in
- es6) export ES_TAG=6.8.1 ;;
- es7) export ES_TAG=7.5.0 ;;
- esac
-
- export TAG=latest
- cd ${DOCKER_DIR} && docker-compose up -d
- - name: Check port available
- run: |
- source ./test/scripts/env.sh
- echo "Waiting for OAP ready"
- export PORT=11800
- check_sw_port
- echo "OAP is ready"
- echo "Waiting for UI ready"
- PORT=8080
- check_sw_port
- echo "UI is ready"
- - name: Collect logs
- run: |
- mkdir -p ${LOG_DIR}
- cd ${DOCKER_DIR}
- docker-compose logs oap > ${LOG_DIR}/oap.txt
- docker-compose logs ui > ${LOG_DIR}/ui.txt
- docker-compose logs elasticsearch > ${LOG_DIR}/es.txt
- continue-on-error: true
- - uses: actions/upload-artifact@v1.0.0
- continue-on-error: true
- with:
- name: logs
- path: /tmp/skywalking
diff --git a/.github/workflows/e2e.alarm.yaml b/.github/workflows/e2e.alarm.yaml
index 4cc4ee5..d316052 100644
--- a/.github/workflows/e2e.alarm.yaml
+++ b/.github/workflows/e2e.alarm.yaml
@@ -48,10 +48,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.config-file }}
diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml
index eeb21c1..db4bf10 100644
--- a/.github/workflows/e2e.cluster.yaml
+++ b/.github/workflows/e2e.cluster.yaml
@@ -44,10 +44,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.config-file }}
diff --git a/.github/workflows/e2e.event.yaml b/.github/workflows/e2e.event.yaml
index 9131f8f..3f8868d 100644
--- a/.github/workflows/e2e.event.yaml
+++ b/.github/workflows/e2e.event.yaml
@@ -47,10 +47,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.config-file }}
diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml
index 883246e..b79b128 100644
--- a/.github/workflows/e2e.go.yaml
+++ b/.github/workflows/e2e.go.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: go/e2e.yaml
diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml
index b9077ee..b1673f8 100644
--- a/.github/workflows/e2e.istio.yaml
+++ b/.github/workflows/e2e.istio.yaml
@@ -40,8 +40,8 @@ jobs:
strategy:
fail-fast: true
matrix:
- analyzer: [k8s-mesh, mx-mesh]
- istio_version: [1.7.1, 1.8.2, 1.9.1, 1.10.3, 1.11.4, 1.12.0]
+ 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 ]
name: Istio(${{ matrix.istio_version }})+ALS(${{ matrix.analyzer }})
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
@@ -50,10 +50,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: istio/als/e2e.yaml
@@ -66,17 +63,14 @@ jobs:
strategy:
fail-fast: true
matrix:
- istio_version: [1.8.2, 1.9.1]
+ istio_version: *istio-versions
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
steps:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: istio/metrics/e2e.yaml
diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml
index 23f8d11..5bf6ea5 100644
--- a/.github/workflows/e2e.jdk-versions.yaml
+++ b/.github/workflows/e2e.jdk-versions.yaml
@@ -41,16 +41,12 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Set Up Java
- if: env.SKIP_CI != 'true'
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: ${{ matrix.jdk }}
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: simple/jdk/e2e.yaml
diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml
index 9d960f8..e5ba923 100644
--- a/.github/workflows/e2e.js.yaml
+++ b/.github/workflows/e2e.js.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
- config-file: browser/e2e.yaml
\ No newline at end of file
+ config-file: browser/e2e.yaml
diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml
index 84207ba..1b702d0 100644
--- a/.github/workflows/e2e.kafka.yaml
+++ b/.github/workflows/e2e.kafka.yaml
@@ -52,10 +52,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.case.config-file }}
diff --git a/.github/workflows/e2e.log.yaml b/.github/workflows/e2e.log.yaml
index 4cdce4f..bf7d7e1 100644
--- a/.github/workflows/e2e.log.yaml
+++ b/.github/workflows/e2e.log.yaml
@@ -74,10 +74,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
env:
ES_VERSION: ${{ matrix.es-version }}
diff --git a/.github/workflows/e2e.nodejs.yaml b/.github/workflows/e2e.nodejs.yaml
index 3972771..67aa344 100644
--- a/.github/workflows/e2e.nodejs.yaml
+++ b/.github/workflows/e2e.nodejs.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: nodejs/e2e.yaml
diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml
index 5fd2444..5627839 100644
--- a/.github/workflows/e2e.php.yaml
+++ b/.github/workflows/e2e.php.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: php/e2e.yaml
diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml
index 169041c..4adc5bf 100644
--- a/.github/workflows/e2e.profiling.yaml
+++ b/.github/workflows/e2e.profiling.yaml
@@ -48,10 +48,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.config-file }}
diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml
index 5f84484..510ae14 100644
--- a/.github/workflows/e2e.python.yaml
+++ b/.github/workflows/e2e.python.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: python/e2e.yaml
diff --git a/.github/workflows/e2e.satellite.yaml b/.github/workflows/e2e.satellite.yaml
index 8e47e3c..48c19f8 100644
--- a/.github/workflows/e2e.satellite.yaml
+++ b/.github/workflows/e2e.satellite.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
- config-file: satellite/native-protocols/e2e.yaml
\ No newline at end of file
+ config-file: satellite/native-protocols/e2e.yaml
diff --git a/.github/workflows/e2e.so11y.yaml b/.github/workflows/e2e.so11y.yaml
index 437dff0..ee77af1 100644
--- a/.github/workflows/e2e.so11y.yaml
+++ b/.github/workflows/e2e.so11y.yaml
@@ -41,10 +41,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: so11y/e2e.yaml
diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index 95f2001..793b858 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -61,10 +61,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
env:
ES_VERSION: ${{ matrix.es-version }}
@@ -78,4 +75,4 @@ jobs:
needs: [StoragePlugins]
steps:
- name: To pass or not pass
- run: echo "Just to make the GitHub merge button green"
\ No newline at end of file
+ run: echo "Just to make the GitHub merge button green"
diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml
index 08ba5a8..b322f42 100644
--- a/.github/workflows/e2e.ttl.yaml
+++ b/.github/workflows/e2e.ttl.yaml
@@ -52,10 +52,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
env:
ES_VERSION: ${{ matrix.es-version }}
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index a667c5d..adaeb54 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -61,10 +61,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Run E2E Test
- if: env.SKIP_CI != 'true'
uses: ./.github/actions/infra-e2e-test
with:
config-file: ${{ matrix.case.config-file }}