Skip to content

Commit ac55dc0

Browse files
authored
[ci] Use M.x version names in workflows (#5546)
## 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 <[email protected]>
1 parent 3d4b6b6 commit ac55dc0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci-elasticsearch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
version:
25-
- major: 7
25+
- major: 7.x
2626
distribution: elasticsearch
2727
jaeger: v1
28-
- major: 8
28+
- major: 8.x
2929
distribution: elasticsearch
3030
jaeger: v1
31-
- major: 8
31+
- major: 8.x
3232
distribution: elasticsearch
3333
jaeger: v2
3434
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

.github/workflows/ci-opensearch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
version:
25-
- major: 1
25+
- major: 1.x
2626
distribution: opensearch
2727
jaeger: v1
28-
- major: 2
28+
- major: 2.x
2929
distribution: opensearch
3030
jaeger: v1
31-
- major: 2
31+
- major: 2.x
3232
distribution: opensearch
3333
jaeger: v2
3434
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

scripts/es-integration-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ bring_up_storage() {
6666
local major_version=${version%%.*}
6767
local compose_file="docker-compose/${distro}/v${major_version}.yml"
6868

69-
echo "starting ${distro} ${version}"
69+
echo "starting ${distro} ${major_version}"
7070
for retry in 1 2 3
7171
do
7272
echo "attempt $retry"

0 commit comments

Comments
 (0)