Skip to content

Commit

Permalink
[ci] Use M.x version names in workflows (#5546)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- #5485
## Description of the changes
- changing how major version is passed eg form 7.x -> 7 

## How was this change tested?
- 

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] 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: mehul gautam <mehulsharma4786@gmail.com>
  • Loading branch information
hellspawn679 committed Jun 10, 2024
1 parent 3d4b6b6 commit ac55dc0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
fail-fast: false
matrix:
version:
- major: 7
- major: 7.x
distribution: elasticsearch
jaeger: v1
- major: 8
- major: 8.x
distribution: elasticsearch
jaeger: v1
- major: 8
- major: 8.x
distribution: elasticsearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-opensearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
fail-fast: false
matrix:
version:
- major: 1
- major: 1.x
distribution: opensearch
jaeger: v1
- major: 2
- major: 2.x
distribution: opensearch
jaeger: v1
- major: 2
- major: 2.x
distribution: opensearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/es-integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ bring_up_storage() {
local major_version=${version%%.*}
local compose_file="docker-compose/${distro}/v${major_version}.yml"

echo "starting ${distro} ${version}"
echo "starting ${distro} ${major_version}"
for retry in 1 2 3
do
echo "attempt $retry"
Expand Down

0 comments on commit ac55dc0

Please sign in to comment.