diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml index 3df1e0283..7bdd5f1f7 100644 --- a/.github/workflows/ci-it.yaml +++ b/.github/workflows/ci-it.yaml @@ -25,6 +25,10 @@ env: MAVEN_OPTS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 +concurrency: + group: ci-it-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: CI: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 9378a9cda..feef0b7ae 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -24,6 +24,10 @@ on: schedule: - cron: '28 3 * * *' +concurrency: + group: codeql-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: analyze: name: Analyze diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml index 63c554bef..19345859c 100644 --- a/.github/workflows/dead-link-checker.yaml +++ b/.github/workflows/dead-link-checker.yaml @@ -19,6 +19,10 @@ name: Dead Link Checker on: pull_request: +concurrency: + group: dlc-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: CheckDeadLinks: runs-on: ubuntu-latest diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml index 52cd6aecd..da74c9d65 100644 --- a/.github/workflows/docker-ci.yaml +++ b/.github/workflows/docker-ci.yaml @@ -24,6 +24,10 @@ on: 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 diff --git a/.github/workflows/e2e.alarm.yaml b/.github/workflows/e2e.alarm.yaml index 87c2ea2c3..27837bbf4 100644 --- a/.github/workflows/e2e.alarm.yaml +++ b/.github/workflows/e2e.alarm.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-alarm-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Alarm: name: Alarm diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml index 2b1dbe252..bb13f184b 100644 --- a/.github/workflows/e2e.cluster.yaml +++ b/.github/workflows/e2e.cluster.yaml @@ -24,6 +24,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-cluster-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: CoordinatorsStorage: name: Coordinators & Storage diff --git a/.github/workflows/e2e.compat.yaml b/.github/workflows/e2e.compat.yaml index bdb37eb8d..4d960533a 100644 --- a/.github/workflows/e2e.compat.yaml +++ b/.github/workflows/e2e.compat.yaml @@ -21,6 +21,10 @@ on: schedule: - cron: '0 18 * * *' +concurrency: + group: e2e-compat-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Compatibility: name: Compatibility diff --git a/.github/workflows/e2e.event.yaml b/.github/workflows/e2e.event.yaml index 04a464f34..7db7b7d2e 100644 --- a/.github/workflows/e2e.event.yaml +++ b/.github/workflows/e2e.event.yaml @@ -24,6 +24,10 @@ on: schedule: - cron: '0 18 * * *' +concurrency: + group: e2e-event-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + env: SKIP_TEST: true diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml index 5f7c77355..fe37f09c6 100644 --- a/.github/workflows/e2e.go.yaml +++ b/.github/workflows/e2e.go.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-go-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: GOAgent: name: GO2SKY @@ -50,4 +54,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.GOE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.GOE2E diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index 09f0daa6c..afc0eeb52 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -31,6 +31,10 @@ env: SCRIPTS_DIR: test/e2e-mesh/e2e-istio/scripts SW_OAP_BASE_IMAGE: openjdk:11-jdk +concurrency: + group: e2e-istio-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: als: runs-on: ubuntu-latest diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index f62410b6c..4b728cda9 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -21,6 +21,10 @@ on: schedule: - cron: '0 18 * * *' +concurrency: + group: e2e-jdk-versions-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: JavaVersions: name: Agent Java Versions diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml index 8b8bf2050..36a3c96bb 100644 --- a/.github/workflows/e2e.js.yaml +++ b/.github/workflows/e2e.js.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-js-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: JavaScriptClient: name: Java Script Client @@ -76,4 +80,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.browser.BrowserWithClientJSE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.browser.BrowserWithClientJSE2E diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml index 62c87d153..36566aaee 100644 --- a/.github/workflows/e2e.kafka.yaml +++ b/.github/workflows/e2e.kafka.yaml @@ -28,6 +28,10 @@ env: SW_AGENT_JDK_VERSION: 8 SW_STORAGE: influxdb +concurrency: + group: e2e-kafka-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Kafka: name: Kafka (${{ matrix.case.name }}) @@ -62,4 +66,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: ${{ matrix.case.class }} \ No newline at end of file + test_class: ${{ matrix.case.class }} diff --git a/.github/workflows/e2e.log.yaml b/.github/workflows/e2e.log.yaml index a561493f8..b61c96618 100644 --- a/.github/workflows/e2e.log.yaml +++ b/.github/workflows/e2e.log.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-log-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Log: name: Log @@ -54,4 +58,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.log.LogE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.log.LogE2E diff --git a/.github/workflows/e2e.nodejs.yaml b/.github/workflows/e2e.nodejs.yaml index 823f9b472..ca75e283c 100644 --- a/.github/workflows/e2e.nodejs.yaml +++ b/.github/workflows/e2e.nodejs.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-nodejs-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: NodeJSAgent: name: NodeJSAgent diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml index 248abfa0a..e49e36fc7 100644 --- a/.github/workflows/e2e.php.yaml +++ b/.github/workflows/e2e.php.yaml @@ -24,6 +24,10 @@ on: schedule: - cron: '0 18 * * *' +concurrency: + group: e2e-php-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PHPAgent: name: PHP @@ -47,4 +51,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.PHPE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.PHPE2E diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index 46d0bffa3..c03ecb0ed 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-profiling-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Profiling: name: Profiling @@ -55,4 +59,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.profile.ProfileE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.profile.ProfileE2E diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml index 37d991f6b..efbe39160 100644 --- a/.github/workflows/e2e.python.yaml +++ b/.github/workflows/e2e.python.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-python-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PythonAgent: name: PythonAgent @@ -50,4 +54,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.PythonE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.PythonE2E diff --git a/.github/workflows/e2e.so11y.yaml b/.github/workflows/e2e.so11y.yaml index 80690fdfd..d292abe5b 100644 --- a/.github/workflows/e2e.so11y.yaml +++ b/.github/workflows/e2e.so11y.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-so11y-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: SelfObservability: name: SelfObservability diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index c567c99bd..c6a56b678 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -24,6 +24,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-storages-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: StoragePlugins: name: Storage diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 6dd69b92a..98725b6e5 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -27,6 +27,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-ttl-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: TTL: name: Storage TTL @@ -55,4 +59,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: org.apache.skywalking.e2e.ttl.StorageTTLE2E \ No newline at end of file + test_class: org.apache.skywalking.e2e.ttl.StorageTTLE2E diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e1c071f5f..0cfef592a 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -28,6 +28,10 @@ on: env: SW_AGENT_JDK_VERSION: 8 +concurrency: + group: e2e-features-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: FeatureGroup01: name: Feature @@ -91,4 +95,4 @@ jobs: if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test with: - test_class: ${{ matrix.case.class }} \ No newline at end of file + test_class: ${{ matrix.case.class }} diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml index 1e2dd24b9..f2a5d9632 100644 --- a/.github/workflows/plugins-jdk14-test.0.yaml +++ b/.github/workflows/plugins-jdk14-test.0.yaml @@ -34,6 +34,10 @@ on: - '!oap-server/**' - '!**.md' +concurrency: + group: plugins-jdk14-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PluginsJDK14Test: name: jdk14 diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index c241d99ea..9c8ac3f94 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -34,6 +34,10 @@ on: - '!oap-server/**' - '!**.md' +concurrency: + group: plugins-0-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PluginsTest: name: Plugin diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index 2cc7654b4..30e43e429 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -34,6 +34,10 @@ on: - '!oap-server/**' - '!**.md' +concurrency: + group: plugins-1-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PluginsTest: name: Plugin diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml index 39298f11c..4cc71284b 100644 --- a/.github/workflows/plugins-test.2.yaml +++ b/.github/workflows/plugins-test.2.yaml @@ -34,6 +34,10 @@ on: - '!oap-server/**' - '!**.md' +concurrency: + group: plugins-2-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PluginsTest: name: Plugin diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 8f9486517..d74d22a4b 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -34,6 +34,10 @@ on: - '!oap-server/**' - '!**.md' +concurrency: + group: plugins-3-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: PluginsTest: name: Plugin