Skip to content

Conversation

@hellspawn679
Copy link
Contributor

@hellspawn679 hellspawn679 commented May 26, 2024

Which problem is this PR solving?

Part of #5485

Description of the changes

  • updated script/es-integration-test.sh to use docker compose files
  • updated .github/workflows/ci-elasticsearch.yml now it only passes the major version for elasticsearch
  • updated .github/workflows/ci-opensearch.yml now it only passes major version for opensearch
  • added docker compose files at docker-compose/elasticsearch and docker-compose/opensearch
  • removed setup_es and setup_opensearch function and a generalized setup_db() function

How was this change tested?

  • CI

Checklist

Signed-off-by: Your Name <[email protected]>
@hellspawn679 hellspawn679 requested a review from a team as a code owner May 26, 2024 22:04
@hellspawn679 hellspawn679 requested a review from yurishkuro May 26, 2024 22:04
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please make sure you're on the latest main, you are working against a stale version

Your Name and others added 3 commits May 27, 2024 15:05
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Script change Lgtm overall

@hellspawn679 hellspawn679 requested a review from yurishkuro May 27, 2024 16:01
Your Name and others added 3 commits May 27, 2024 23:14
@yurishkuro
Copy link
Member

did you do a local run of these tests?

@hellspawn679
Copy link
Contributor Author

hellspawn679 commented May 27, 2024

yes locally it is running fine
let me make somemore changes

@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label May 27, 2024
Signed-off-by: Your Name <[email protected]>
Your Name and others added 4 commits May 28, 2024 12:55
@hellspawn679 hellspawn679 requested a review from yurishkuro May 28, 2024 12:05
Your Name added 2 commits May 28, 2024 23:59
Signed-off-by: Your Name <[email protected]>
@hellspawn679 hellspawn679 requested a review from yurishkuro May 28, 2024 18:36
@codecov
Copy link

codecov bot commented May 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.20%. Comparing base (a7a7308) to head (4c87285).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5490   +/-   ##
=======================================
  Coverage   96.20%   96.20%           
=======================================
  Files         330      330           
  Lines       16151    16151           
=======================================
  Hits        15538    15538           
  Misses        437      437           
  Partials      176      176           
Flag Coverage Δ
badger_v1 8.05% <ø> (ø)
badger_v2 1.93% <ø> (ø)
cassandra-3.x-v1 16.43% <ø> (ø)
cassandra-3.x-v2 1.85% <ø> (ø)
cassandra-4.x-v1 16.43% <ø> (ø)
cassandra-4.x-v2 1.85% <ø> (ø)
elasticsearch-7.x-v1 18.89% <ø> (+0.01%) ⬆️
elasticsearch-8.x-v1 19.08% <ø> (+0.01%) ⬆️
elasticsearch-8.x-v2 19.08% <ø> (ø)
grpc_v1 9.53% <ø> (+0.01%) ⬆️
grpc_v2 7.58% <ø> (ø)
kafka 9.78% <ø> (ø)
opensearch-1.x-v1 18.92% <ø> (ø)
opensearch-2.x-v1 18.94% <ø> (ø)
opensearch-2.x-v2 18.92% <ø> (ø)
unittests 93.91% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@hellspawn679 hellspawn679 changed the title updating ci updating ci for elasticsearch and opensearch May 28, 2024
Your Name added 2 commits May 29, 2024 03:55
Signed-off-by: Your Name <[email protected]>
Signed-off-by: Your Name <[email protected]>
@hellspawn679 hellspawn679 requested a review from yurishkuro May 28, 2024 23:26
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@yurishkuro yurishkuro changed the title updating ci for elasticsearch and opensearch Use docker compose for elasticsearch/opensearch integration tests May 28, 2024
@yurishkuro yurishkuro enabled auto-merge (squash) May 28, 2024 23:46
@yurishkuro yurishkuro disabled auto-merge May 28, 2024 23:53
@hellspawn679
Copy link
Contributor Author

@yurishkuro do you why is this codecov test failing

@yurishkuro yurishkuro merged commit 5900360 into jaegertracing:main May 28, 2024
@yurishkuro
Copy link
Member

Thanks!

@yurishkuro
Copy link
Member

@hellspawn679 one thing we forgot is to add the sections to .github/dependabot.yml so that dependabot can actually upgrade versions in those files

@yurishkuro
Copy link
Member

codecov - I think it was just a delay, it now updated the comment saying 96% coverage #5490 (comment)

@hellspawn679
Copy link
Contributor Author

ok i will add it

@hellspawn679 one thing we forgot is to add the sections to .github/dependabot.yml so that dependabot can actually upgrade versions in those files

varshith257 pushed a commit to varshith257/jaeger that referenced this pull request Jun 2, 2024
…egertracing#5490)

## Which problem is this PR solving?

Part of jaegertracing#5485

## Description of the changes
* updated `script/es-integration-test.sh` to use docker compose files
* updated `.github/workflows/ci-elasticsearch.yml` now it only passes
the major version for elasticsearch
* updated `.github/workflows/ci-opensearch.yml` now it only passes major
version for opensearch
* added docker compose files at `docker-compose/elasticsearch` and
`docker-compose/opensearch`
* removed` setup_es` and `setup_opensearch` function and a generalized
`setup_db()` function

## How was this change tested?
- CI

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Your Name <[email protected]>
Signed-off-by: mehul gautam  <[email protected]>
Co-authored-by: Your Name <[email protected]>
Signed-off-by: Vamshi Maskuri <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:ci Change related to continuous integration / testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants