From d9f679281f84fef2a77629812febc337cec45f7c Mon Sep 17 00:00:00 2001
From: Petrik <petrik@deheus.net>
Date: Sat, 26 Oct 2024 19:15:41 +0200
Subject: [PATCH] [ruby/sinatra] Remove some test variations

Don't run every permutation as there isn't a lot of variation.
Limit to running:
- Puma with MySQL (the default)
- Puma with Postgres
- Unicorn with Postgres
- Passenger with Postgres

This remove the following variations which were slower that their
Postgres alternative:
- Unicorn with MySQL
- Passenger with MySQL
---
 frameworks/Ruby/sinatra/benchmark_config.json | 44 -------------------
 .../sinatra/sinatra-passenger-mri.dockerfile  | 26 -----------
 .../sinatra/sinatra-unicorn-mri.dockerfile    | 19 --------
 3 files changed, 89 deletions(-)
 delete mode 100644 frameworks/Ruby/sinatra/sinatra-passenger-mri.dockerfile
 delete mode 100644 frameworks/Ruby/sinatra/sinatra-unicorn-mri.dockerfile

diff --git a/frameworks/Ruby/sinatra/benchmark_config.json b/frameworks/Ruby/sinatra/benchmark_config.json
index 166a2e9e2bf..2c0be64ed47 100644
--- a/frameworks/Ruby/sinatra/benchmark_config.json
+++ b/frameworks/Ruby/sinatra/benchmark_config.json
@@ -44,28 +44,6 @@
         "versus": "rack-postgres-puma-mri",
         "notes": ""
       },
-      "passenger-mri": {
-        "json_url": "/json",
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "MySQL",
-        "framework": "sinatra",
-        "language": "Ruby",
-        "orm": "Full",
-        "platform": "Rack",
-        "webserver": "Passenger",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "sinatra-passenger-mri",
-        "versus": "rack-passenger-mri",
-        "notes": ""
-      },
       "postgres-passenger-mri": {
         "db_url": "/db",
         "query_url": "/queries?queries=",
@@ -86,28 +64,6 @@
         "versus": "rack-postgres-passenger-mri",
         "notes": ""
       },
-      "unicorn-mri": {
-        "json_url": "/json",
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "MySQL",
-        "framework": "sinatra",
-        "language": "Ruby",
-        "orm": "Full",
-        "platform": "Rack",
-        "webserver": "Unicorn",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "sinatra-unicorn-mri",
-        "versus": "rack-unicorn-mri",
-        "notes": ""
-      },
       "postgres-unicorn-mri": {
         "db_url": "/db",
         "query_url": "/queries?queries=",
diff --git a/frameworks/Ruby/sinatra/sinatra-passenger-mri.dockerfile b/frameworks/Ruby/sinatra/sinatra-passenger-mri.dockerfile
deleted file mode 100644
index eb07d7b5ba7..00000000000
--- a/frameworks/Ruby/sinatra/sinatra-passenger-mri.dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ruby:3.3
-
-ENV RUBY_YJIT_ENABLE=1
-
-# Use Jemalloc
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libjemalloc2
-ENV LD_PRELOAD=libjemalloc.so.2
-
-ADD ./ /sinatra
-WORKDIR /sinatra
-
-RUN bundle install --jobs=4 --gemfile=/sinatra/Gemfile
-
-# TODO: https://github.com/phusion/passenger/issues/1916
-ENV _PASSENGER_FORCE_HTTP_SESSION=true
-ENV DBTYPE=mysql
-
-RUN ruby -r /sinatra/config/auto_tune -e 'puts auto_tune.first' > instances
-
-EXPOSE 8080
-
-CMD bundle exec passenger start --log-level 1 \
-       --engine builtin --disable-turbocaching --disable-security-update-check \
-       --spawn-method direct --max-pool-size $(cat instances) --min-instances $(cat instances) --max-request-queue-size 1024 \
-       --address 0.0.0.0 --port 8080 --environment production
diff --git a/frameworks/Ruby/sinatra/sinatra-unicorn-mri.dockerfile b/frameworks/Ruby/sinatra/sinatra-unicorn-mri.dockerfile
deleted file mode 100644
index f0dede838aa..00000000000
--- a/frameworks/Ruby/sinatra/sinatra-unicorn-mri.dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM ruby:3.4-rc
-
-ENV RUBY_YJIT_ENABLE=1
-
-# Use Jemalloc
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libjemalloc2
-ENV LD_PRELOAD=libjemalloc.so.2
-
-ADD ./ /sinatra
-WORKDIR /sinatra
-
-RUN bundle install --jobs=4 --gemfile=/sinatra/Gemfile
-
-ENV DBTYPE=mysql
-
-EXPOSE 8080
-
-CMD bundle exec unicorn -c config/mri_unicorn.rb -o 0.0.0.0 -p 8080 -E production