Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Use docker compose for cassandra integration tests #5520

Merged
merged 4 commits into from
Jun 3, 2024

Conversation

hellspawn679
Copy link
Contributor

Which problem is this PR solving?

Description of the changes

  • updated cassaandra-integration-test.sh to use docker compose
  • update dependabot

How was this change tested?

  • bash scripts/cassandra-integration-test.sh 3 v003 v1 bash scripts/cassandra-integration-test.sh 3 v003 v2 bash scripts/cassandra-integration-test.sh 4 v004 v1 scripts/cassandra-integration-test.sh 4 v004 v2

Checklist

Your Name added 2 commits June 3, 2024 21:02
Signed-off-by: Your Name <you@example.com>
Signed-off-by: Your Name <you@example.com>
@hellspawn679 hellspawn679 requested a review from a team as a code owner June 3, 2024 15:46
@hellspawn679 hellspawn679 requested a review from pavolloffay June 3, 2024 15:46
Copy link

codecov bot commented Jun 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.19%. Comparing base (3f82224) to head (cc26580).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5520      +/-   ##
==========================================
- Coverage   96.20%   96.19%   -0.02%     
==========================================
  Files         327      327              
  Lines       16011    16013       +2     
==========================================
  Hits        15403    15403              
- Misses        434      435       +1     
- Partials      174      175       +1     
Flag Coverage Δ
badger_v1 8.05% <ø> (-0.01%) ⬇️
badger_v2 1.93% <ø> (-0.01%) ⬇️
cassandra-3.x-v1 16.44% <ø> (+0.01%) ⬆️
cassandra-3.x-v2 1.85% <ø> (-0.01%) ⬇️
cassandra-4.x-v1 16.44% <ø> (+0.01%) ⬆️
cassandra-4.x-v2 1.85% <ø> (-0.01%) ⬇️
elasticsearch-7-v1 18.89% <ø> (-0.01%) ⬇️
elasticsearch-8-v1 19.07% <ø> (-0.01%) ⬇️
elasticsearch-8-v2 19.08% <ø> (-0.01%) ⬇️
grpc_v1 9.48% <ø> (-0.01%) ⬇️
grpc_v2 7.52% <ø> (-0.02%) ⬇️
kafka 9.78% <ø> (-0.01%) ⬇️
opensearch-1-v1 18.94% <ø> (+<0.01%) ⬆️
opensearch-2-v1 18.94% <ø> (-0.01%) ⬇️
opensearch-2-v2 18.92% <ø> (-0.02%) ⬇️
unittests 93.88% <ø> (-0.02%) ⬇️

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 Use docker compose for kafka integration tests Use docker compose for cassandra integration tests Jun 3, 2024
@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Jun 3, 2024
@@ -53,13 +46,14 @@ apply_schema() {

run_integration_test() {
local version=$1
local major_version=${version%%.*}
Copy link
Member

Choose a reason for hiding this comment

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

Can we do the same with es/os scripts? Their matrix was changed "7.x" -> "7", which makes the workflow names look weird. I would prefer to go back to 7.x / 8.x

Copy link
Member

Choose a reason for hiding this comment

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

Can be a separate PR for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok i will create a new pr after this

cid=$(docker run "${params[@]}" "${image}:${tag}")
echo "cid=${cid}" >> "$GITHUB_OUTPUT"
echo "${cid}"
local major_version=$1
Copy link
Member

Choose a reason for hiding this comment

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

why is this needed?

local schema_version=$2
local jaegerVersion=$3
local primaryKeyspace="jaeger_v1_dc1"
local archiveKeyspace="jaeger_v1_dc1_archive"
local compose_file="docker-compose/cassandra/v3.yaml"
Copy link
Member

@yurishkuro yurishkuro Jun 3, 2024

Choose a reason for hiding this comment

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

why is this hardcoded to v3?

Signed-off-by: Your Name <you@example.com>
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.

Thanks!

@hellspawn679 hellspawn679 requested a review from yurishkuro June 3, 2024 19:43
@yurishkuro yurishkuro merged commit 5863430 into jaegertracing:main Jun 3, 2024
40 checks passed
@yurishkuro
Copy link
Member

Signed-off-by: Your Name you@example.com

I would advise you to fix this setting in your git.

@@ -136,3 +136,10 @@ updates:
allow:
- dependency-name: "bitnami/kafka"
update-types: ["version-update:semver-minor"]
- package-ecosystem: docker
directory: /docker-compose/cassandra
Copy link
Member

Choose a reason for hiding this comment

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

@hellspawn679 I don't think this is working, the dependabot runs did not pick this up. I suspect that when you pick docker ecosystem and a directory, dependabot looks for standard file names like Dockerfile or docker-compose.yml. Since you're using custom file names like v3.yml, dependabot doesn't know that they are for docker-compose. We probably need to list the files explicitly instead of specifying a dir only.

Copy link
Member

Choose a reason for hiding this comment

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

# for free to join this conversation on GitHub. Already have an account? # 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