Skip to content

Commit

Permalink
ci: move suites that use rabbitmq from circleci to gitlab (#10640)
Browse files Browse the repository at this point in the history
This change moves two test suites to gitlab from circleci for billing
purposes.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [ ] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: erikayasuda <[email protected]>
  • Loading branch information
emmettbutler and erikayasuda authored Sep 17, 2024
1 parent 1647e6e commit fc13212
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 34 deletions.
30 changes: 0 additions & 30 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,25 +581,6 @@ jobs:
wait: cassandra
pattern: 'cassandra'

celery:
<<: *contrib_job_large
docker:
- image: *ddtrace_dev_image
- image: *redis_image
- image: *rabbitmq_image
- image: *testagent_image
environment:
- LOG_LEVEL=DEBUG
- SNAPSHOT_DIR=/snapshots
- PORT=9126
- SNAPSHOT_CI=1
- DD_POOL_TRACE_CHECK_FAILURES=true
- DD_DISABLE_ERROR_RESPONSES=true
- ENABLED_CHECKS=trace_stall,meta_tracer_version_header,trace_content_length,trace_peer_service,trace_dd_service # disable flaky content length check
steps:
- run_test:
pattern: 'celery'

consul:
<<: *contrib_job_small
docker:
Expand Down Expand Up @@ -722,17 +703,6 @@ jobs:
wait: postgres
pattern: 'aiopg'

kombu:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- image: *rabbitmq_image
- *testagent
steps:
- run_test:
wait: rabbitmq
pattern: 'kombu'

build_docs:
# build documentation and store as an artifact
executor: ddtrace_dev
Expand Down
4 changes: 3 additions & 1 deletion .gitlab/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_DB: postgres

rabbitmq:
name: registry.ddbuild.io/images/mirror/rabbitmq:3.12.7-management-alpine
alias: rabbitmq
31 changes: 28 additions & 3 deletions .gitlab/tests/contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,23 @@ bottle:
variables:
SUITE_NAME: "bottle"

celery:
extends: .test_base_riot_snapshot
services:
- !reference [.test_base_riot_snapshot, services]
- !reference [.services, rabbitmq]
- !reference [.services, redis]
variables:
SUITE_NAME: "celery"
LOG_LEVEL: DEBUG
SNAPSHOT_DIR: /snapshots
PORT: 9126
SNAPSHOT_CI: 1
DD_POOL_TRACE_CHECK_FAILURES: true
DD_DISABLE_ERROR_RESPONSES: true
ENABLED_CHECKS: trace_stall,meta_tracer_version_header,trace_content_length,trace_peer_service,trace_dd_service # disable flaky content length check


cherrypy:
extends: .test_base_riot_snapshot
variables:
Expand All @@ -55,7 +72,7 @@ django_hosts:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: 'django_hosts$'

djangorestframework:
extends: .test_base_riot_snapshot
services:
Expand Down Expand Up @@ -159,6 +176,14 @@ kafka:
TEST_KAFKA_HOST: "kafka"
TEST_KAFKA_PORT: "29092"

kombu:
extends: .test_base_riot_snapshot
services:
- !reference [.test_base_riot_snapshot, services]
- !reference [.services, rabbitmq]
variables:
SUITE_NAME: "kombu"

logbook:
extends: .test_base_riot_snapshot
variables:
Expand Down Expand Up @@ -188,7 +213,7 @@ opentracer:
extends: .test_base_riot
variables:
SUITE_NAME: "opentracer"

pylibmc:
extends: .test_base_riot_snapshot
services:
Expand Down Expand Up @@ -290,7 +315,7 @@ structlog:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: "structlog"

sourcecode:
extends: .test_base_riot
variables:
Expand Down

0 comments on commit fc13212

Please sign in to comment.