Skip to content

Commit

Permalink
Move e2e scripts to scripts/e2e (#6448)
Browse files Browse the repository at this point in the history
<!--
!! Please DELETE this comment before posting.
We appreciate your contribution to the Jaeger project! πŸ‘‹πŸŽ‰
-->

## Which problem is this PR solving?
part of 
- #6429


## Description of the changes
- organized e2e scripts

---------

Signed-off-by: danish9039 <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
  • Loading branch information
danish9039 and yurishkuro authored Jan 1, 2025
1 parent d0ad732 commit 244b759
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ 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/e2e/cassandra.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}
env:
SKIP_APPLY_SCHEMA: ${{ matrix.create-schema == 'auto' && true || false }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ 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/e2e/elasticsearch.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-e2e-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ jobs:

- name: Run kafka integration tests
id: test-execution
run: bash scripts/kafka-integration-test.sh -j ${{ matrix.jaeger-version }} -v ${{ matrix.kafka-version }}
run: bash scripts/e2e/kafka.sh -j ${{ matrix.jaeger-version }} -v ${{ matrix.kafka-version }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out
flags: kafka-${{ matrix.kafka-version }}-${{ matrix.jaeger-version }}

2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-opensearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ 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/e2e/elasticsearch.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-spm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
uses: ./.github/actions/setup-node.js

- name: Run SPM Test
run: bash scripts/spm-integration-test.sh -b ${{ matrix.mode.binary }}
run: bash scripts/e2e/spm.sh -b ${{ matrix.mode.binary }}
2 changes: 1 addition & 1 deletion plugin/storage/es/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To locally test the ElasticSearch storage plugin,

All integration tests also run on pull request via GitHub Actions. This integration test is against ElasticSearch v7.x and v8.x.

* The script used in GitHub Actions can be found under `scripts/es-integration-test.sh`,
* The script used in GitHub Actions can be found under `scripts/e2e/elasticsearch.sh`,
and that script be run from the top folder to integration test ElasticSearch as well.
This script requires Docker to be running.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 244b759

Please sign in to comment.