Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce CI duration by modifying e2e test execution strategy #6416

Closed
wants to merge 1 commit into from
Closed

Reduce CI duration by modifying e2e test execution strategy #6416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci-e2e-cassandra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: CIT Cassandra

on:
workflow_call:

schedule:
- cron "0 0 * * *"
concurrency:
group: cit-cassandra-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true
Expand All @@ -19,18 +20,17 @@ jobs:
matrix:
jaeger-version: [v1, v2]
create-schema: [manual, auto]
cassandra-version: ${{ fromJSON(env.cassandra-version) }}
version:
- distribution: cassandra
major: 4.x
schema: v004
- distribution: cassandra
major: 5.x
schema: v004
exclude:
# Exclude v1 as create schema on fly is available for v2 only
- jaeger-version: v1
create-schema: auto
name: ${{ matrix.version.distribution }}-${{ matrix.version.major }} ${{ matrix.jaeger-version }} schema=${{ matrix.create-schema }}
env:
cassandra-version: ${{ github.event_name == 'schedule' && '[4.x, 5.x]' || '[5.x]' }}
name: ${{ matrix.version.distribution }}-${{ matrix.cassandra-version }} ${{ matrix.jaeger-version }} schema=${{ matrix.create-schema }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand All @@ -45,12 +45,12 @@ jobs:

- name: Run cassandra integration tests
id: test-execution
run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}
run: bash scripts/cassandra-integration-test.sh ${{ matrix.cassandra-version }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}
env:
SKIP_APPLY_SCHEMA: ${{ matrix.create-schema == 'auto' && true || false }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out
flags: cassandra-${{ matrix.version.major }}-${{ matrix.jaeger-version }}-${{ matrix.create-schema }}
flags: cassandra-${{ matrix.cassandra-version }}-${{ matrix.jaeger-version }}-${{ matrix.create-schema }}
25 changes: 10 additions & 15 deletions .github/workflows/ci-e2e-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: CIT Elasticsearch

on:
workflow_call:
schedule:
- cron "0 0 * * *"

concurrency:
group: cit-elasticsearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
Expand All @@ -17,20 +19,13 @@ jobs:
strategy:
fail-fast: false
matrix:
jaeger-version: [ v1, v2 ]
es-version: ${{ fromJSON(env.es-version) }}
version:
- major: 6.x
distribution: elasticsearch
jaeger: v1
- major: 7.x
distribution: elasticsearch
jaeger: v1
- major: 8.x
distribution: elasticsearch
jaeger: v1
- major: 8.x
distribution: elasticsearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
- distribution: elasticsearch
env:
es-version: ${{ github.event_name == 'schedule' && '["8.x", "7.x", "6.x"]' || '["8.x"]' }}
name: ${{ matrix.version.distribution }} ${{ matrix.es-version }} ${{ matrix.jaeger-version }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand All @@ -57,11 +52,11 @@ jobs:
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- name: Run ${{ matrix.version.distribution }} integration tests
id: test-execution
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.es-version }} ${{ matrix.jaeger-version }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out,cover-index-cleaner.out,cover-index-rollover.out
flags: ${{ matrix.version.distribution }}-${{ matrix.version.major }}-${{ matrix.version.jaeger }}
flags: ${{ matrix.version.distribution }}-${{ matrix.es-version }}-${{ matrix.jaeger-version }}

4 changes: 3 additions & 1 deletion .github/workflows/ci-e2e-kafka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ jobs:
fail-fast: false
matrix:
jaeger-version: [v1, v2]
kafka-version: ["3.x", "2.x"]
kafka-version: ${{ fromJSON(env.kafka-version) }}
name: kafka ${{matrix.kafka-version }} ${{ matrix.jaeger-version }}
env:
kafka-version: ${{ github.event_name == 'schedule' && '[3.x, 2.x]' || '[3.x]' }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/ci-e2e-opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: CIT OpenSearch

on:
workflow_call:
schedule:
- cron "0 0 * * *"

concurrency:
group: cit-opensearch-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
Expand All @@ -17,17 +19,13 @@ jobs:
strategy:
fail-fast: false
matrix:
jaeger-version: [ v1, v2 ]
opensearch-version: ${{ fromJSON(env.opensearch-version) }}
version:
- major: 1.x
distribution: opensearch
jaeger: v1
- major: 2.x
distribution: opensearch
jaeger: v1
- major: 2.x
distribution: opensearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
- distribution: opensearch
env:
opensearch-version: ${{ github.event_name == 'schedule' && '[1.x, 2.x]' || '[2.x]' }}
name: ${{ matrix.version.distribution }} ${{ matrix.opensearch-version }} ${{ matrix.jaeger-version }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand All @@ -50,10 +48,10 @@ jobs:

- name: Run ${{ matrix.version.distribution }} integration tests
id: test-execution
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.opensearch-version }} ${{ matrix.jaeger-version }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out,cover-index-cleaner.out,cover-index-rollover.out
flags: ${{ matrix.version.distribution }}-${{ matrix.version.major }}-${{ matrix.version.jaeger }}
flags: ${{ matrix.version.distribution }}-${{ matrix.opensearch-version }}-${{ matrix.jaeger-version }}
3 changes: 2 additions & 1 deletion renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
],
"groupName": "github-actions deps",
"schedule": [
"on the first day of the month"
"on the first day of the month",
"at midnight"
]
},
{
Expand Down
Loading