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

Check elastic search gh workflow #5776

Closed
wants to merge 3 commits into from
Closed

Check elastic search gh workflow #5776

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
4074737
Check elastic search gh workflow
joeyyy09 Jul 25, 2024
566d42d
rename script
joeyyy09 Jul 25, 2024
e094df4
Fixes
joeyyy09 Jul 25, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.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/elasticsearch-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}


- name: Output ${{ matrix.version.distribution }} logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-e2e-opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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/elasticsearch-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}


- name: Output ${{ matrix.version.distribution }} logs
Expand Down
4 changes: 2 additions & 2 deletions scripts/es-integration-test.sh → scripts/elasticsearch-integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ check_arg() {
# start the elasticsearch/opensearch container
setup_db() {
local compose_file=$1
docker compose -f "${compose_file}" up -d
docker-compose -f "${compose_file}" up -d
echo "docker_compose_file=${compose_file}" >> "${GITHUB_OUTPUT:-/dev/null}"
}

Expand Down Expand Up @@ -119,7 +119,7 @@ main() {
bring_up_storage "${distro}" "${es_version}"
build_local_img
if [[ "${j_version}" == "v2" ]]; then
STORAGE=${distro} SPAN_STORAGE_TYPE=${distro} make jaeger-v2-storage-integration-test
STORAGE=${distro} make jaeger-v2-storage-integration-test
elif [[ "${j_version}" == "v1" ]]; then
STORAGE=${distro} make storage-integration-test
make index-cleaner-integration-test
Expand Down
Loading