8000 etcd_docker 5: Incorporate docker based etcd approach into docker integration tests. by andrewmains12 · Pull Request #4149 · m3db/m3 · GitHub
[go: up one dir, main page]
Skip to content

etcd_docker 5: Incorporate docker based etcd approach into docker integration tests. - #4149

Closed
andrewmains12 wants to merge 1 commit into
uber/20220830-grpc_updatefrom
pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172
Closed

etcd_docker 5: Incorporate docker based etcd approach into docker integration tests.#4149
andrewmains12 wants to merge 1 commit into
uber/20220830-grpc_updatefrom
pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172

Conversation

@andrewmains12
@andrewmains12 andrewmains12 commented Aug 29, 2022 •
edited
Loading
Copy link
Copy Markdown
Contributor

PR 5 for #4144

This PR makes the docker integration tests use containerized etcd.
Previously, these relied on M3DB running an embbeded etcd server.

There's no inherent need for this, and it opens us up to dependency issues as described
in the linked github issue.

Note: there are a handful that require multiple servers; these are currently "skipped" (commented). I intend to bring those
back at a later date..

Stack:

⚠️ Part of a stack created by spr. Do not merge manually using the UI - doing so may have unexpected results.

This was referenced Aug 29, 2022
Merged
Merged
Closed
Merged
Merged
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from e0944c8 to 914ac93 Compare August 30, 2022 14:44
@andrewmains12 andrewmains12 changed the title Incorporate docker based etcd approach into docker integration tests. etcd_docker 5: Incorporate docker based etcd approach into docker integration tests. Aug 30, 2022
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 8445afb to e639964 Compare August 30, 2022 15:16
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch 2 times, most recently from 78835f0 to cb8db85 Compare August 30, 2022 16:04
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 50a14e2 to 77ca046 Compare August 30, 2022 16:52
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from cb8db85 to 0ef0995 Compare August 30, 2022 16:52
justinjc
justinjc reviewed Aug 30, 2022
View reviewed changes
Comment thread scripts/docker-integration-tests/cold_writes_simple/test.sh Resolved
Comment thread scripts/docker-integration-tests/prometheus_replication/test.sh Resolved
Comment thread scripts/docker-integration-tests/run.sh Resolved
Comment thread scripts/docker-integration-tests/prometheus_replication/docker-compose.yml Resolved
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from 0ef0995 to 73e9f32 Compare August 30, 2022 17:31
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 77ca046 to d7b617c Compare August 30, 2022 17:47
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch 3 times, most recently from 87111b2 to 364111f Compare August 30, 2022 21:28
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 16b5b60 to 6910f1e Compare August 30, 2022 21:47
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from 364111f to 2b6636a Compare August 30, 2022 21:47
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 6910f1e to c8b6a12 Compare August 30, 2022 22:01
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch 2 times, most recently from 6d9b5bd to c165783 Compare August 30, 2022 22:13
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from 0580883 to b47a381 Compare August 30, 2022 22:57
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from c165783 to 18efb5b Compare August 30, 2022 22:57
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd branch from b47a381 to 9398782 Compare August 31, 2022 14:38
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch 2 times, most recently from 12ed8fb to f41faba Compare August 31, 2022 15:18
justinjc
justinjc reviewed Aug 31, 2022
View reviewed changes
Comment thread scripts/docker-integration-tests/common.sh Resolved
Comment thread scripts/docker-integration-tests/prometheus_replication/test.sh Outdated
function defer {
docker-compose -f ${COMPOSE_FILE} down || echo "unable to shutdown containers" # CI fails to stop all containers sometimes
:
# docker-compose -f ${COMPOSE_FILE} down || echo "unable to shutdown containers" # CI fails to stop all containers sometimes
@justinjc justinjc Aug 31, 2022
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Do we not need this anymore? If not, why not just remove the entire function the the trap defer EXIT below?

Base automatically changed from pr/andrewmains12/amains/grpc-update/etcd_tests.review/3ae12ffd to uber/20220830-grpc_update September 2, 2022 14:50
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from f41faba to 8778662 Compare September 2, 2022 14:50
@andrewmains12
etcd_docker 5: Incorporate docker based etcd approach into docker int…
4b8bede 
…egration tests.

PR 5 for #4144

This PR makes the docker integration tests use containerized etcd.
Previously, these relied on M3DB running an embbeded etcd server.

There's no inherent need for this, and it opens us up to dependency issues as described
in the linked github issue.

Note: there are a handful that require multiple servers; these are currently "skipped" (commented). I intend to bring those
back at a later date..

commit-id:e67a5172
@andrewmains12
andrewmains12 force-pushed the pr/andrewmains12/amains/grpc-update/etcd_tests.review/e67a5172 branch from 8778662 to 4b8bede Compare September 2, 2022 16:17
@andrewmains12
andrewmains12 commented Sep 2, 2022
Copy link
Copy Markdown
Contributor Author

✓ Commit merged in pull request #4150

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@justinjc justinjc justinjc approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andrewmains12 @justinjc
0