Merge pull request #4074 from DataDog/tonycthsu/replace-circleci-images

Replace docker images for testing and development
DataDog · Nov 6, 2024 · 25d6fb8 · 25d6fb8
2 parents c7d75d6 + 7acb479
commit 25d6fb8
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 1,041 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -162,7 +162,6 @@ orbs:
     jobs:
       build:
         <<: *test_job_default
-        resource_class: <<parameters.resource_class_to_use>>
         steps:
           - checkout
           - restore_cache:
@@ -285,6 +284,15 @@ orbs:
               command: |
                 # Create a unique coverage directory for this job, to avoid conflicts when merging all results
                 echo 'export COVERAGE_DIR="$COVERAGE_BASE_DIR/versions/$CIRCLE_JOB/$CIRCLE_NODE_INDEX"' >> $BASH_ENV
+          # Install dockerize
+          - run:
+              name: Install dockerize
+              command: |
+                DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17.0/dockerize-$(uname -s | tr '[:upper:]' '[:lower:]')-$(arch | sed 's/aarch64/arm64/')"
+                DOCKERIZE_URL: $DOCKERIZE_URL
+                curl --silent --show-error --location --fail --retry 3 --output /usr/local/bin/dockerize $DOCKERIZE_URL
+                chmod +x /usr/local/bin/dockerize
+                dockerize --version
           # Wait for containers to start
           - docker-wait:
               port: 5432
@@ -307,6 +315,10 @@ orbs:
               host: "testagent"
               port: 9126
           - *step_run_all_tests
+          - run:
+              # Test agent uses `jq` to check results
+              name: Install jq
+              command: apt update && apt install jq -y
           - *step_get_test_agent_trace_check_results
           - store_test_results:
               path: /tmp/rspec
@@ -385,56 +397,56 @@ job_configuration:
   - &config-2_5
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-2.5.9'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.5.9-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.5
     resource_class_to_use: medium+
   - &config-2_6
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-2.6.10'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.6.10-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.6
     resource_class_to_use: medium+
   - &config-2_7
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-2.7.6'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.7
     resource_class_to_use: medium+
   - &config-2_7-small
     <<: *config-2_7
     resource_class_to_use: small
   - &config-3_0
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-3.0.4'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.0
     resource_class_to_use: medium+
   - &config-3_1
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-3.1.2'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.1
     resource_class_to_use: medium+
   - &config-3_2
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-3.2.0'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.2
     resource_class_to_use: medium+
   - &config-3_3
     <<: *filters_all_branches_and_tags
     ruby_version: 'ruby-3.3.0'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.3
     resource_class_to_use: medium+
     # ADD NEW RUBIES HERE
   - &config-jruby-9_2 # More recent release of 9.2
     <<: *filters_all_branches_and_tags
     ruby_version: 'jruby-9.2.21.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.21.0-dd
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.2
     resource_class_to_use: large
   - &config-jruby-9_3
     <<: *filters_all_branches_and_tags
     ruby_version: 'jruby-9.3.9.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.3.9.0-dd
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.3
     resource_class_to_use: large
   - &config-jruby-9_4
     <<: *filters_all_branches_and_tags
     ruby_version: 'jruby-9.4.7.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.4
     resource_class_to_use: large
 
 workflows:

diff --git a/.circleci/images/primary/Dockerfile-2.5.9 b/.circleci/images/primary/Dockerfile-2.5.9
diff --git a/.circleci/images/primary/Dockerfile-2.6.10 b/.circleci/images/primary/Dockerfile-2.6.10
diff --git a/.circleci/images/primary/Dockerfile-2.7.8 b/.circleci/images/primary/Dockerfile-2.7.8
diff --git a/.circleci/images/primary/Dockerfile-3.0.7 b/.circleci/images/primary/Dockerfile-3.0.7