Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove disabled JRuby 9.2.8.0 testing setup #2683

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Remove disabled JRuby 9.2.8.0 testing setup #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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":
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down
119 changes: 0 additions & 119 deletions .circleci/images/primary/Dockerfile-jruby-9.2.8.0
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions .github/workflows/build-ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions tasks/appraisal.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down