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.

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

Add github action for elasticsearch otel integration tests #2671

Merged
merged 7 commits into from
Dec 1, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Feedbacks changes
Signed-off-by: Ashmita Bohara <[email protected]>
  • Loading branch information
Ashmita152 committed Dec 1, 2020
commit aff5a6c07d38f2f87a9d0f11ba05780fe8976806
34 changes: 32 additions & 2 deletions .github/workflows/ci-elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:
branches: [ master ]

jobs:
elasticsearch:
elasticsearch-5:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -20,4 +20,34 @@ jobs:
run: make install-ci

- name: Run elasticsearch integration tests
run: bash scripts/travis/es-integration-test.sh default
run: bash scripts/travis/es-integration-test.sh default 5.6.16

elasticsearch-6:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run elasticsearch integration tests
run: bash scripts/travis/es-integration-test.sh default 6.8.2

elasticsearch-7:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run elasticsearch integration tests
run: bash scripts/travis/es-integration-test.sh default 7.3.0
34 changes: 32 additions & 2 deletions .github/workflows/es-otel-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:
branches: [ master ]

jobs:
elasticsearch-otel:
elasticsearch-otel-5:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -20,4 +20,34 @@ jobs:
run: make install-ci

- name: Run elasticsearch otel integration tests
run: bash scripts/travis/es-integration-test.sh otel
run: bash scripts/travis/es-integration-test.sh otel 5.6.16

elasticsearch-otel-6:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run elasticsearch otel integration tests
run: bash scripts/travis/es-integration-test.sh otel 6.8.2

elasticsearch-otel-7:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: ^1.15

- name: Install tools
run: make install-ci

- name: Run elasticsearch otel integration tests
run: bash scripts/travis/es-integration-test.sh otel 7.3.0
10 changes: 4 additions & 6 deletions scripts/travis/es-integration-test.sh
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
set -euxf -o pipefail

usage() {
echo $"Usage: $0 (default|otel)"
echo $"Usage: $0 (default|otel) <es_version>"
exit 1
}

check_arg() {
if [ $# -eq 0 ]; then
echo "ERROR: no argument"
if [ ! $# -eq 2 ]; then
echo "ERROR: need exactly two arguments"
usage
fi
}
@@ -87,9 +87,7 @@ run_token_propagation_test() {
main() {
check_arg "$@"

run_integration_test "$1" "5.6.16"
run_integration_test "$1" "6.8.2"
run_integration_test "$1" "7.3.0"
run_integration_test "$1" "$2"

if [ "$1" == "otel" ]; then
echo "OpenTelemetry ES exporter test finished, skipping token propagation tests"