Skip to content

Split v1 and v2 ES/OS integration tests #5487

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

Merged
merged 3 commits into from
May 26, 2024
Merged

Split v1 and v2 ES/OS integration tests #5487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c162374
Split v1 and v2 ES/OS integration tests
yurishkuro May 26, 2024
6d8b110
fix
yurishkuro May 26, 2024
b9a0194
fix
yurishkuro May 26, 2024
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
17 changes: 12 additions & 5 deletions .github/workflows/ci-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,22 @@ jobs:
elasticsearch:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version:
- major: 7.x
image: 7.14.0
distribution: elasticsearch
jaeger: v1
- major: 8.x
image: 8.8.2
distribution: elasticsearch
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
jaeger: v1
- major: 8.x
image: 8.8.2
distribution: elasticsearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
Expand All @@ -51,16 +58,16 @@ jobs:

- uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

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

- name: Output Elasticsearch logs
- name: Output ${{ matrix.version.distribution }} logs
run: docker logs ${{ steps.test-execution.outputs.cid }}
if: ${{ failure() }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out,cover-index-cleaner.out,cover-index-rollover.out
flags: elasticsearch-${{ matrix.version.major }}
flags: ${{ matrix.version.distribution }}-${{ matrix.version.major }}-${{ matrix.version.jaeger }}
17 changes: 12 additions & 5 deletions .github/workflows/ci-opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,22 @@ jobs:
opensearch:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version:
- major: 1.x
image: 1.3.7
distribution: opensearch
jaeger: v1
- major: 2.x
image: 2.3.0
distribution: opensearch
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
jaeger: v1
- major: 2.x
image: 2.3.0
distribution: opensearch
jaeger: v2
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
Expand All @@ -51,16 +58,16 @@ jobs:

- uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

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

- name: Output Opensearch logs
- name: Output ${{ matrix.version.distribution }} logs
run: docker logs ${{ steps.test-execution.outputs.cid }}
if: ${{ failure() }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out,cover-index-cleaner.out,cover-index-rollover.out
flags: opensearch-${{ matrix.version.major }}
flags: ${{ matrix.version.distribution }}-${{ matrix.version.major }}-${{ matrix.version.jaeger }}
21 changes: 13 additions & 8 deletions scripts/es-integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ usage() {
}

check_arg() {
if [ ! $# -eq 2 ]; then
echo "ERROR: need exactly two arguments, <elasticsearch|opensearch> <image>"
if [ ! $# -eq 3 ]; then
echo "ERROR: need exactly two arguments, <elasticsearch|opensearch> <image> <jaeger-version>"
usage
fi
}
Expand Down Expand Up @@ -132,13 +132,18 @@ teardown_storage() {
main() {
check_arg "$@"
local distro=$1
local version=$2
local es_version=$2
local j_version=$2

bring_up_storage "${distro}" "${es_version}"

bring_up_storage "${distro}" "${version}"
STORAGE=${distro} make storage-integration-test
STORAGE=${distro} SPAN_STORAGE_TYPE=${distro} make jaeger-v2-storage-integration-test
make index-cleaner-integration-test
make index-rollover-integration-test
if [[ "${j_version}" == "v2" ]]; then
STORAGE=${distro} SPAN_STORAGE_TYPE=${distro} make jaeger-v2-storage-integration-test
else
STORAGE=${distro} make storage-integration-test
make index-cleaner-integration-test
make index-rollover-integration-test
fi
}

main "$@"