Skip to content

Commit

Permalink
Run e2e jobs as a single workflow (jaegertracing#6310)
Browse files Browse the repository at this point in the history
Signed-off-by: vaidikcode <[email protected]>

## Which problem is this PR solving?
- Task one of jaegertracing#6278 

## Description of the changes
- Integrated all e2e workflows jobs into a single workflow

## How was this change tested?
- CI

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
  • Loading branch information
3 people authored Dec 7, 2024
1 parent 526d36c commit 593315b
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 43 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/ci-e2e-all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: E2E Tests

on:
push:
branches: [main]

pull_request:
branches: [main]

concurrency:
group: combined-cit-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read

jobs:
badger:
uses: ./.github/workflows/ci-e2e-badger.yaml

cassandra:
uses: ./.github/workflows/ci-e2e-cassandra.yml

elasticsearch:
uses: ./.github/workflows/ci-e2e-elasticsearch.yml

grpc:
uses: ./.github/workflows/ci-e2e-grpc.yml

kafka:
uses: ./.github/workflows/ci-e2e-kafka.yml

memory:
uses: ./.github/workflows/ci-e2e-memory.yaml

opensearch:
uses: ./.github/workflows/ci-e2e-opensearch.yml





8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-badger.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT Badger

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-badger-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-cassandra.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT Cassandra

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-cassandra-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT Elasticsearch

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-elasticsearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-grpc.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT gRPC

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-grpc-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci-e2e-kafka.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT Kafka

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-kafka-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand All @@ -22,7 +18,7 @@ jobs:
fail-fast: false
matrix:
jaeger-version: [v1, v2] # Adjust if there are specific versions of Jaeger
name: Kafka Integration Tests ${{ matrix.jaeger-version }}
name: kafka ${{ matrix.jaeger-version }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-memory.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT Memory

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-memory-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-e2e-opensearch.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: CIT OpenSearch

on:
push:
branches: [main]

pull_request:
branches: [main]
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
group: cit-opensearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
Expand Down

0 comments on commit 593315b

Please sign in to comment.