Skip to content

Commit

Permalink
ci: move many suites with no service dependencies to gitlab from circ…
Browse files Browse the repository at this point in the history
…leci (#10537)

This change moves a bunch of test suites from circleci to gitlab 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
- [x] 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)
  • Loading branch information
emmettbutler authored Sep 6, 2024
1 parent 91aa6fc commit 2730c1c
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 101 deletions.
101 changes: 0 additions & 101 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -556,44 +556,12 @@ jobs:
env: 'dd_coverage'
snapshot: true

llmobs:
<<: *contrib_job
steps:
- run_test:
pattern: "llmobs"

subprocess:
<<: *contrib_job_small
steps:
- run_test:
pattern: "subprocess"

sourcecode:
<<: *contrib_job_small
steps:
- run_test:
pattern: "sourcecode"

debugger:
<<: *contrib_job
steps:
- run_test:
pattern: "debugger"

openai:
<<: *machine_executor
parallelism: 10
steps:
- run_test:
pattern: 'openai'
snapshot: true

opentracer:
<<: *contrib_job_large
steps:
- run_test:
pattern: 'opentracer'

opentelemetry:
parallelism: 4
<<: *machine_executor
Expand All @@ -611,24 +579,6 @@ jobs:
snapshot: true
docker_services: "localstack"

test_logging:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'test_logging'

stdlib:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'asyncio$|sqlite3$|futures$|dbapi$|dbapi_async$'

asyncpg:
<<: *machine_executor
steps:
Expand Down Expand Up @@ -709,13 +659,6 @@ jobs:
snapshot: true
docker_services: "memcached redis postgres"

django_hosts:
<<: *machine_executor
steps:
- run_test:
pattern: 'django_hosts$'
snapshot: true

djangorestframework:
<<: *machine_executor
parallelism: 2
Expand Down Expand Up @@ -822,20 +765,6 @@ jobs:
pattern: 'pytest'
snapshot: true

pytest_v2:
<<: *machine_executor
parallelism: 10
steps:
- run_hatch_env_test:
env: 'pytest_plugin_v2'
snapshot: true

asynctest:
executor: ddtrace_dev
steps:
- run_test:
pattern: 'asynctest$'

pymemcache:
<<: *contrib_job
docker:
Expand Down Expand Up @@ -938,36 +867,6 @@ jobs:
wait: rabbitmq
pattern: 'kombu'

langchain:
<<: *machine_executor
parallelism: 6
steps:
- run_test:
pattern: "langchain"
snapshot: true

anthropic:
<<: *machine_executor
parallelism: 3
steps:
- run_test:
pattern: "anthropic"
snapshot: true

logbook:
<<: *machine_executor
steps:
- run_test:
pattern: 'logbook'
snapshot: true

loguru:
<<: *machine_executor
steps:
- run_test:
pattern: 'loguru'
snapshot: true

build_docs:
# build documentation and store as an artifact
executor: ddtrace_dev
Expand Down
1 change: 1 addition & 0 deletions .gitlab/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ include:
- local: ".gitlab/tests/appsec.yml"
- local: ".gitlab/tests/contrib.yml"
- local: ".gitlab/tests/core.yml"
- local: ".gitlab/tests/debugging.yml"
- local: ".gitlab/tests/tracer.yml"
- local: ".gitlab/tests/profiling.yml"
70 changes: 70 additions & 0 deletions .gitlab/tests/contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,73 @@ wsgi:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: "wsgi"

langchain:
extends: .test_base_riot_snapshot
parallel: 6
variables:
SUITE_NAME: "langchain"

anthropic:
extends: .test_base_riot_snapshot
parallel: 3
variables:
SUITE_NAME: "anthropic"

loguru:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: "loguru"

logbook:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: "logbook"

asynctest:
extends: .test_base_riot
variables:
SUITE_NAME: 'asynctest$'

pytest_v2:
extends: .test_base_riot_snapshot
parallel: 10
variables:
SUITE_NAME: 'pytest_plugin_v2'

django_hosts:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: 'django_hosts$'

test_logging:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: 'test_logging'

stdlib:
extends: .test_base_riot_snapshot
variables:
SUITE_NAME: 'asyncio$|sqlite3$|futures$|dbapi$|dbapi_async$'

llmobs:
extends: .test_base_riot
variables:
SUITE_NAME: "llmobs"

subprocess:
extends: .test_base_riot
variables:
SUITE_NAME: "subprocess"

openai:
extends: .test_base_riot_snapshot
parallel: 10
variables:
SUITE_NAME: "openai"

opentracer:
extends: .test_base_riot
variables:
SUITE_NAME: "opentracer"

5 changes: 5 additions & 0 deletions .gitlab/tests/debugging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
debugger:
extends: .test_base_riot
variables:
SUITE_NAME: "debugger"

0 comments on commit 2730c1c

Please sign in to comment.