Skip to content

Commit 96b4a11

Browse files
authored
ci: circleci->gitlab for suites that use the mysql and postgres images (#12484)
This change moves to gitlab all of the remaining test suites that communicate with the Postgres or Mysql images as part of the ongoing migration away from circleci. ## 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)
1 parent daffd53 commit 96b4a11

File tree

2 files changed

+20
-106
lines changed

2 files changed

+20
-106
lines changed

.circleci/config.templ.yml

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@ ubuntu_base_image: &ubuntu_base_img ubuntu-2004:2023.04.2
55
cimg_base_image: &cimg_base_image cimg/base:2022.08
66
python310_image: &python310_image cimg/python:3.10.12
77
ddtrace_dev_image: &ddtrace_dev_image ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269
8-
redis_image: &redis_image redis:4.0-alpine@sha256:3e99741f293147ff406657dda7644c2b88564b80a498cd00da8f905743449c9f
9-
memcached_image: &memcached_image memcached:1.5-alpine@sha256:48cb7207e3d34871893fa1628f3a4984375153e9942facf82e25935b0a633c8a
10-
cassandra_image: &cassandra_image cassandra:3.11.7@sha256:495e5752526f7e75d3ad85b6a6bbf3b79714321b17a44255a216c341e3baae11
118
consul_image: &consul_image consul:1.6.0@sha256:daa6203532fc30d81bf6c5593f79a2c7c23f08e8fde82f1e4bd8069b48b57596
129
moto_image: &moto_image datadog/docker-library:moto_1_0_1@sha256:58c15f03141073629f4ff2a78910b812205324579c76f8bcac87e8e89af2e673
13-
mysql_image: &mysql_image mysql:5.7@sha256:03b6dcedf5a2754da00e119e2cc6094ed3c884ad36b67bb25fe67be4b4f9bdb1
14-
postgres_image: &postgres_image postgres:12-alpine@sha256:c6704f41eb84be53d5977cb821bf0e5e876064b55eafef1e260c2574de40ad9a
1510
mongo_image: &mongo_image mongo:3.6@sha256:19c11a8f1064fd2bb713ef1270f79a742a184cd57d9bb922efdd2a8eca514af8
1611
httpbin_image: &httpbin_image kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
17-
vertica_image: &vertica_image vertica/vertica-ce:latest
18-
rabbitmq_image: &rabbitmq_image rabbitmq:3.7-alpine
1912
testagent_image: &testagent_image ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.20.0
2013

2114
parameters:
@@ -313,21 +306,6 @@ httpbin_local: &httpbin_local
313306
image: *httpbin_image
314307
name: httpbin.org
315308

316-
mysql_server: &mysql_server
317-
image: *mysql_image
318-
environment:
319-
- MYSQL_ROOT_PASSWORD=admin
320-
- MYSQL_PASSWORD=test
321-
- MYSQL_USER=test
322-
- MYSQL_DATABASE=test
323-
324-
postgres_server: &postgres_server
325-
image: *postgres_image
326-
environment:
327-
- POSTGRES_PASSWORD=postgres
328-
- POSTGRES_USER=postgres
329-
- POSTGRES_DB=postgres
330-
331309
testagent: &testagent
332310
image: *testagent_image
333311
environment:
@@ -444,14 +422,6 @@ jobs:
444422
snapshot: true
445423
docker_services: "localstack"
446424

447-
asyncpg:
448-
<<: *machine_executor
449-
steps:
450-
- run_test:
451-
pattern: 'asyncpg'
452-
snapshot: true
453-
docker_services: 'postgres'
454-
455425
consul:
456426
<<: *contrib_job_small
457427
docker:
@@ -471,39 +441,6 @@ jobs:
471441
snapshot: true
472442
docker_services: "mariadb"
473443

474-
mysqlconnector:
475-
<<: *contrib_job
476-
docker:
477-
- image: *ddtrace_dev_image
478-
- *mysql_server
479-
- *testagent
480-
steps:
481-
- run_test:
482-
wait: mysql
483-
pattern: 'mysql$'
484-
485-
mysqlpython:
486-
<<: *contrib_job
487-
docker:
488-
- image: *ddtrace_dev_image
489-
- *mysql_server
490-
- *testagent
491-
steps:
492-
- run_test:
493-
wait: mysql
494-
pattern: 'mysqldb$'
495-
496-
pymysql:
497-
<<: *contrib_job
498-
docker:
499-
- image: *ddtrace_dev_image
500-
- *mysql_server
501-
- *testagent
502-
steps:
503-
- run_test:
504-
wait: mysql
505-
pattern: 'pymysql$'
506-
507444
mongoengine:
508445
<<: *machine_executor
509446
steps:
@@ -512,28 +449,6 @@ jobs:
512449
snapshot: true
513450
docker_services: 'mongo'
514451

515-
sqlalchemy:
516-
<<: *contrib_job_small
517-
docker:
518-
- image: *ddtrace_dev_image
519-
- *testagent
520-
- *postgres_server
521-
- *mysql_server
522-
steps:
523-
- run_test:
524-
wait: postgres mysql
525-
pattern: "sqlalchemy"
526-
527-
psycopg:
528-
<<: *machine_executor
529-
parallelism: 4
530-
steps:
531-
- run_test:
532-
# We want psycopg and psycopg2 collected
533-
pattern: "psycopg"
534-
snapshot: true
535-
docker_services: "postgres"
536-
537452
aiobotocore:
538453
<<: *contrib_job
539454
docker:
@@ -544,27 +459,6 @@ jobs:
544459
- run_test:
545460
pattern: 'aiobotocore'
546461

547-
aiomysql:
548-
<<: *machine_executor
549-
steps:
550-
- run_test:
551-
docker_services: 'mysql'
552-
wait: mysql
553-
pattern: 'aiomysql'
554-
snapshot: true
555-
556-
aiopg:
557-
<<: *contrib_job_small
558-
parallelism: 4
559-
docker:
560-
- image: *ddtrace_dev_image
561-
- *postgres_server
562-
- *testagent
563-
steps:
564-
- run_test:
565-
wait: postgres
566-
pattern: 'aiopg'
567-
568462
build_docs:
569463
# build documentation and store as an artifact
570464
executor: ddtrace_dev

tests/contrib/suitespec.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,9 @@ suites:
286286
- tests/snapshots/tests.{suite}.*
287287
- tests/contrib/shared_tests_async.py
288288
runner: riot
289+
services:
290+
- mysql
291+
snapshot: true
289292
aiopg:
290293
paths:
291294
- '@bootstrap'
@@ -298,6 +301,9 @@ suites:
298301
- tests/contrib/aiopg/*
299302
- tests/contrib/shared_tests_async.py
300303
runner: riot
304+
snapshot: true
305+
services:
306+
- postgres
301307
algoliasearch:
302308
paths:
303309
- '@bootstrap'
@@ -348,6 +354,8 @@ suites:
348354
- tests/contrib/shared_tests_async.py
349355
runner: riot
350356
snapshot: true
357+
services:
358+
- postgres
351359
asynctest:
352360
parallelism: 2
353361
paths:
@@ -837,6 +845,8 @@ suites:
837845
pattern: mysqldb$
838846
runner: riot
839847
skip: true
848+
services:
849+
- mysql
840850
opentelemetry:
841851
parallelism: 4
842852
paths:
@@ -880,6 +890,9 @@ suites:
880890
- tests/snapshots/tests.contrib.psycopg2.*
881891
- tests/contrib/shared_tests.py
882892
runner: riot
893+
services:
894+
- postgres
895+
snapshot: true
883896
pylibmc:
884897
paths:
885898
- '@bootstrap'
@@ -928,6 +941,9 @@ suites:
928941
- tests/contrib/mysql/*
929942
- tests/contrib/shared_tests.py
930943
runner: riot
944+
services:
945+
- mysql
946+
snapshot: true
931947
pynamodb:
932948
paths:
933949
- '@bootstrap'
@@ -1058,6 +1074,10 @@ suites:
10581074
- '@dbapi'
10591075
- tests/contrib/sqlalchemy/*
10601076
runner: riot
1077+
services:
1078+
- postgres
1079+
- mysql
1080+
snapshot: true
10611081
starlette:
10621082
paths:
10631083
- '@bootstrap'

0 commit comments

Comments
 (0)