Remove disabled JRuby 9.2.8.0 testing setup

**What does this PR do?**: In #2572 we changed our CI setup to test only with JRuby 9.2.21.0, disabling JRuby 9.2.8.0. Prior to that change, we tested with both versions. At the time we decided to only disable the JRuby 9.2.8.0 testing, commenting it out. This PR actually removes all references to testing with JRuby 9.2.8.0. As a reminder, we recommend that all our customers use at least JRuby 9.2.21.0, and also recommend evaluating the move to JRuby 9.3, as the JRuby developers have marked JRuby 9.2 as end-of-life: <https://twitter.com/jruby/status/1611063274459566106>. **Motivation**: Avoid having leftover setup that's not in use. **Additional Notes**: N/A **How to test the change?**: Validate that CI is still green on all configurations.
DataDog · Mar 10, 2023 · ec3f13f · ec3f13f
1 parent 22541af
commit ec3f13f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 182 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -524,12 +524,6 @@ job_configuration:
     image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
     resource_class_to_use: medium+
     # ADD NEW RUBIES HERE
-  # TODO: Disabled for possible removal
-  # - &config-jruby-9_2_8_0 # Test with older 9.2 release because 9.2.9.0 changed behavior, see https://github.com/DataDog/dd-trace-rb/pull/1409
-  #   <<: *filters_all_branches_and_tags
-  #   ruby_version: 'jruby-9.2.8.0'
-  #   image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.8.0-dd
-  #   resource_class_to_use: medium+
   - &config-jruby-9_2 # More recent release of 9.2
     <<: *filters_all_branches_and_tags
     ruby_version: 'jruby-9.2.21.0'
@@ -565,8 +559,6 @@ workflows:
             - test-3.1
             - test-3.2
             # ADD NEW RUBIES HERE
-            # TODO: Disabled for possible removal
-            #- test-jruby-9.2.8.0
             - test-jruby-9.2
             - test-jruby-9.3
       - orb/changelog:
@@ -717,15 +709,6 @@ workflows:
           requires:
             - build-3.2
       # ADD NEW RUBIES HERE
-      # TODO: Disabled for possible removal
-      # - orb/build:
-      #     <<: *config-jruby-9_2_8_0
-      #     name: build-jruby-9.2.8.0
-      # - orb/test:
-      #     <<: *config-jruby-9_2_8_0
-      #     name: test-jruby-9.2.8.0
-      #     requires:
-      #       - build-jruby-9.2.8.0
       - orb/build:
           <<: *config-jruby-9_2
           name: build-jruby-9.2
@@ -758,8 +741,6 @@ workflows:
             - test-3.1
             - test-3.2
             # ADD NEW RUBIES HERE
-            # TODO: Disabled for possible removal
-            # - test-jruby-9.2.8.0
             - test-jruby-9.2
             - test-jruby-9.3
       - "deploy release":
@@ -777,8 +758,6 @@ workflows:
             - test-3.1
             - test-3.2
             # ADD NEW RUBIES HERE
-            # TODO: Disabled for possible removal
-            # - test-jruby-9.2.8.0
             - test-jruby-9.2
             - test-jruby-9.3
   # This workflow runs the same `build` and `test` jobs as above on a schedule.
@@ -941,16 +920,6 @@ workflows:
           requires:
             - build-3.2
       # ADD NEW RUBIES HERE
-      # TODO: Disabled for possible removal
-      # - orb/build:
-      #     <<: *config-jruby-9_2_8_0
-      #     name: build-jruby-9.2.8.0
-      #     edge: true
-      # - orb/test:
-      #     <<: *config-jruby-9_2_8_0
-      #     name: test-jruby-9.2.8.0
-      #     requires:
-      #       - build-jruby-9.2.8.0
       - orb/build:
           <<: *config-jruby-9_2
           name: build-jruby-9.2

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.2.8.0 b/.circleci/images/primary/Dockerfile-jruby-9.2.8.0
diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml
@@ -54,10 +54,6 @@ jobs:
           - engine: jruby
             version: 9.2.21.0
             dockerfile: Dockerfile-jruby-9.2.21.0
-          # TODO: Disabled for possible removal
-          # - engine: jruby
-          #   version: 9.2.8.0
-          #   dockerfile: Dockerfile-jruby-9.2.8.0
           - engine: jruby
             version: 9.3.9.0
             dockerfile: Dockerfile-jruby-9.3.9.0

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -264,31 +264,6 @@ services:
       - bundle-3.2:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   # ADD NEW RUBIES HERE
-  # JRuby
-  # TODO: Disabled for possible removal
-  # tracer-jruby-9.2.8.0:
-  #   image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.8.0-dd
-  #   command: /bin/bash
-  #   depends_on:
-  #     - ddagent
-  #     - elasticsearch
-  #     - memcached
-  #     - mongodb
-  #     - mysql
-  #     - postgres
-  #     - presto
-  #     - redis
-  #     - redis_old
-  #   env_file: ./.env
-  #   environment:
-  #     <<: *common-environment
-  #     BUNDLE_GEMFILE: /app/Gemfile-jruby-9.2.8.0
-  #   stdin_open: true
-  #   tty: true
-  #   volumes:
-  #     - .:/app
-  #     - bundle-jruby-9.2.8.0:/usr/local/bundle
-  #     - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-jruby-9.2:
     image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.21.0-dd
     command: /bin/bash
@@ -454,7 +429,6 @@ volumes:
   bundle-3.1:
   bundle-3.2:
   # ADD NEW RUBIES HERE
-  #bundle-jruby-9.2.8.0: # TODO: Disabled for possible removal
   bundle-jruby-9.2:
   bundle-jruby-9.3:
   bundle-jruby-9.4:

diff --git a/tasks/appraisal.rake b/tasks/appraisal.rake
@@ -53,7 +53,6 @@ namespace :appraisal do # rubocop:disable Metrics/BlockLength
       '3.0' => '3.0.4',
       '3.1' => '3.1.2',
       '3.2' => '3.2.0',
-      'jruby-9.2.8.0' => 'jruby-9.2.8.0',
       'jruby-9.2' => 'jruby-9.2.21.0',
       'jruby-9.3' => 'jruby-9.3.9.0',
       'jruby-9.4' => 'jruby-9.4.0.0',
@@ -162,7 +161,6 @@ TRACER_VERSIONS = [
   '3.0',
   '3.1',
   '3.2',
-  # 'jruby-9.2.8.0', # TODO: disabled for possible removal
   'jruby-9.2',
   'jruby-9.3',
   'jruby-9.4',