ci: move boto suites to gitlab

.circleci/config.templ.yml

@@ -6,7 +6,6 @@ cimg_base_image: &cimg_base_image cimg/base:2022.08
 python310_image: &python310_image cimg/python:3.10.12
 ddtrace_dev_image: &ddtrace_dev_image ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269
 consul_image: &consul_image consul:1.6.0@sha256:daa6203532fc30d81bf6c5593f79a2c7c23f08e8fde82f1e4bd8069b48b57596
-moto_image: &moto_image datadog/docker-library:moto_1_0_1@sha256:58c15f03141073629f4ff2a78910b812205324579c76f8bcac87e8e89af2e673
 mongo_image: &mongo_image mongo:3.6@sha256:19c11a8f1064fd2bb713ef1270f79a742a184cd57d9bb922efdd2a8eca514af8
 httpbin_image: &httpbin_image kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
 testagent_image: &testagent_image ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.20.0
@@ -413,15 +412,6 @@ jobs:
           pattern: 'opentelemetry'
           snapshot: true
 
-  botocore:
-    <<: *machine_executor
-    parallelism: 6
-    steps:
-      - run_test:
-          pattern: 'botocore'
-          snapshot: true
-          docker_services: "localstack"
-
   consul:
     <<: *contrib_job_small
     docker:
@@ -449,16 +439,6 @@ jobs:
           snapshot: true
           docker_services: 'mongo'
 
-  aiobotocore:
-    <<: *contrib_job
-    docker:
-      - image: *ddtrace_dev_image
-      - image: *moto_image
-      - *testagent
-    steps:
-       - run_test:
-          pattern: 'aiobotocore'
-
   build_docs:
     # build documentation and store as an artifact
     executor: ddtrace_dev

.gitlab/services.yml

@@ -97,3 +97,12 @@
     variables:
       MAX_HEAP_SIZE: 512M
       HEAP_NEWSIZE: 256M
+  moto:
+    name: registry.ddbuild.io/images/mirror/moto:1.0.1
+    alias: moto
+  localstack:
+    name: registry.ddbuild.io/images/mirror/localstack:1.4.0
+    alias: localstack
+    variables:
+      LAMBDA_EXECUTOR: local
+      DOCKER_HOST: unix:///var/run/docker.sock

tests/contrib/aiobotocore/utils.py

@@ -7,12 +7,12 @@
 
 
 LOCALSTACK_ENDPOINT_URL = {
-    "s3": "http://localhost:5000",
-    "ec2": "http://localhost:5001",
-    "kms": "http://localhost:5002",
-    "sqs": "http://localhost:5003",
-    "lambda": "http://localhost:5004",
-    "kinesis": "http://localhost:5005",
+    "s3": "https://localhost:5000",
+    "ec2": "https://localhost:5001",
+    "kms": "https://localhost:5002",
+    "sqs": "https://localhost:5003",
+    "lambda": "https://localhost:5004",
+    "kinesis": "https://localhost:5005",
 }
 
 

tests/contrib/suitespec.yml

@@ -263,6 +263,9 @@ suites:
       - '@botocore'
       - tests/contrib/aiobotocore/*
     runner: riot
+    services:
+      - moto
+    snapshot: true
   aiohttp:
     parallelism: 3
     paths:
@@ -420,6 +423,8 @@ suites:
     pattern: ^botocore$
     runner: riot
     snapshot: true
+    services:
+      - localstack
   bottle:
     paths:
       - '@bootstrap'