From ccc6dfaf7eebf19c464d26aec1a22b3aa07fccdd Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Mon, 12 Jan 2026 18:03:38 +0100 Subject: [PATCH 1/2] Remove Ruby container for 3.1. And remove references to that Ruby stream. That version is EOL. --- 3.1/.exclude-c9s | 0 3.1/.exclude-rhel8 | 0 3.1/.exclude-rhel9 | 0 3.1/Dockerfile.c9s | 66 ------------------ 3.1/Dockerfile.rhel8 | 65 ------------------ 3.1/Dockerfile.rhel9 | 65 ------------------ 3.1/README.md | 4 -- 3.1/root/opt/app-root/.gemrc | 9 --- 3.1/root/opt/app-root/etc/puma.cfg | 50 -------------- 3.1/s2i/bin/assemble | 68 ------------------- 3.1/s2i/bin/run | 39 ----------- 3.1/s2i/bin/usage | 18 ----- 3.1/test/__init__.py | 1 - 3.1/test/conftest.py | 1 - 3.1/test/examples | 1 - 3.1/test/imagestreams | 1 - 3.1/test/puma-test-app/Gemfile | 4 -- 3.1/test/puma-test-app/Gemfile.lock | 25 ------- 3.1/test/puma-test-app/app.rb | 5 -- 3.1/test/puma-test-app/config.ru | 2 - 3.1/test/rack-test-app/Gemfile | 4 -- 3.1/test/rack-test-app/Gemfile.lock | 23 ------- 3.1/test/rack-test-app/app.rb | 5 -- 3.1/test/rack-test-app/config.ru | 2 - 3.1/test/run | 1 - 3.1/test/run-openshift-pytest | 1 - 3.1/test/run-openshift-remote-cluster | 1 - 3.1/test/run-pytest | 1 - 3.1/test/test-lib-openshift.sh | 1 - 3.1/test/test-lib-remote-openshift.sh | 1 - 3.1/test/test-lib-ruby.sh | 1 - 3.1/test/test-lib.sh | 1 - 3.1/test/test-openshift.yaml | 1 - 3.1/test/test_container_application.py | 1 - 3.1/test/test_container_basics.py | 1 - 3.1/test/test_container_fips.py | 1 - 3.1/test/test_ocp_helm_ruby_imagestreams.py | 1 - .../test_ocp_helm_ruby_rails_application.py | 1 - 3.1/test/test_ocp_ruby_ex_standalone.py | 1 - 3.1/test/test_ocp_ruby_latest_imagestreams.py | 1 - 3.1/test/test_ocp_s2i_imagestreams.py | 1 - 3.1/test/test_ocp_s2i_integration.py | 1 - 3.1/test/test_ocp_s2i_templates.py | 1 - examples/from-dockerfile/Dockerfile | 2 +- examples/from-dockerfile/Dockerfile.s2i | 2 +- test/test_ocp_helm_ruby_imagestreams.py | 2 - 46 files changed, 2 insertions(+), 481 deletions(-) delete mode 100644 3.1/.exclude-c9s delete mode 100644 3.1/.exclude-rhel8 delete mode 100644 3.1/.exclude-rhel9 delete mode 100644 3.1/Dockerfile.c9s delete mode 100644 3.1/Dockerfile.rhel8 delete mode 100644 3.1/Dockerfile.rhel9 delete mode 100644 3.1/README.md delete mode 100644 3.1/root/opt/app-root/.gemrc delete mode 100644 3.1/root/opt/app-root/etc/puma.cfg delete mode 100755 3.1/s2i/bin/assemble delete mode 100755 3.1/s2i/bin/run delete mode 100755 3.1/s2i/bin/usage delete mode 120000 3.1/test/__init__.py delete mode 120000 3.1/test/conftest.py delete mode 120000 3.1/test/examples delete mode 120000 3.1/test/imagestreams delete mode 100755 3.1/test/puma-test-app/Gemfile delete mode 100644 3.1/test/puma-test-app/Gemfile.lock delete mode 100755 3.1/test/puma-test-app/app.rb delete mode 100755 3.1/test/puma-test-app/config.ru delete mode 100755 3.1/test/rack-test-app/Gemfile delete mode 100644 3.1/test/rack-test-app/Gemfile.lock delete mode 100755 3.1/test/rack-test-app/app.rb delete mode 100755 3.1/test/rack-test-app/config.ru delete mode 120000 3.1/test/run delete mode 120000 3.1/test/run-openshift-pytest delete mode 120000 3.1/test/run-openshift-remote-cluster delete mode 120000 3.1/test/run-pytest delete mode 120000 3.1/test/test-lib-openshift.sh delete mode 120000 3.1/test/test-lib-remote-openshift.sh delete mode 120000 3.1/test/test-lib-ruby.sh delete mode 120000 3.1/test/test-lib.sh delete mode 120000 3.1/test/test-openshift.yaml delete mode 120000 3.1/test/test_container_application.py delete mode 120000 3.1/test/test_container_basics.py delete mode 120000 3.1/test/test_container_fips.py delete mode 120000 3.1/test/test_ocp_helm_ruby_imagestreams.py delete mode 120000 3.1/test/test_ocp_helm_ruby_rails_application.py delete mode 120000 3.1/test/test_ocp_ruby_ex_standalone.py delete mode 120000 3.1/test/test_ocp_ruby_latest_imagestreams.py delete mode 120000 3.1/test/test_ocp_s2i_imagestreams.py delete mode 120000 3.1/test/test_ocp_s2i_integration.py delete mode 120000 3.1/test/test_ocp_s2i_templates.py diff --git a/3.1/.exclude-c9s b/3.1/.exclude-c9s deleted file mode 100644 index e69de29b..00000000 diff --git a/3.1/.exclude-rhel8 b/3.1/.exclude-rhel8 deleted file mode 100644 index e69de29b..00000000 diff --git a/3.1/.exclude-rhel9 b/3.1/.exclude-rhel9 deleted file mode 100644 index e69de29b..00000000 diff --git a/3.1/Dockerfile.c9s b/3.1/Dockerfile.c9s deleted file mode 100644 index 0a81b662..00000000 --- a/3.1/Dockerfile.c9s +++ /dev/null @@ -1,66 +0,0 @@ -FROM quay.io/sclorg/s2i-base-c9s:c9s - -# This image provides a Ruby environment you can use to run your Ruby -# applications. - -EXPOSE 8080 - -ENV RUBY_MAJOR_VERSION=3 \ - RUBY_MINOR_VERSION=1 - -ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \ - RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}" - -ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \ - IMAGE_NAME="ubi8/ruby-${RUBY_SCL_NAME_VERSION}" \ - SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \ - DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \ -building and running various Ruby $RUBY_VERSION applications and frameworks. \ -Ruby is the interpreted scripting language for quick and easy object-oriented programming. \ -It has many features to process text files and to do system management tasks (as in Perl). \ -It is simple, straight-forward, and extensible." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Ruby ${RUBY_VERSION}" \ - io.openshift.expose-services="8080:http" \ - io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \ - com.redhat.component="${RUBY_SCL}-container" \ - name="${IMAGE_NAME}" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ - usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \ ---context-dir=${RUBY_VERSION}/test/puma-test-app/ ${IMAGE_NAME} ruby-sample-app" \ - maintainer="SoftwareCollections.org " - -RUN yum -y module enable ruby:$RUBY_VERSION && \ - INSTALL_PKGS=" \ - libffi-devel \ - ruby \ - ruby-devel \ - rubygem-rake \ - rubygem-bundler \ - ruby-bundled-gems \ - redhat-rpm-config \ - " && \ - yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ - yum reinstall -y --setopt=tsflags=nodocs tzdata && \ - yum -y clean all --enablerepo='*' && \ - ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \ - rpm -V ${INSTALL_PKGS} - -# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Copy extra files to the image. -COPY ./root/ / - -# Drop the root user and make the content of /opt/app-root owned by user 1001 -RUN chown -R 1001:0 ${APP_ROOT} && chmod -R ug+rwx ${APP_ROOT} && \ - rpm-file-permissions - -USER 1001 - -# Set the default CMD to print the usage of the language image -CMD $STI_SCRIPTS_PATH/usage diff --git a/3.1/Dockerfile.rhel8 b/3.1/Dockerfile.rhel8 deleted file mode 100644 index b650d92a..00000000 --- a/3.1/Dockerfile.rhel8 +++ /dev/null @@ -1,65 +0,0 @@ -FROM ubi8/s2i-base - -# This image provides a Ruby environment you can use to run your Ruby -# applications. - -EXPOSE 8080 - -ENV RUBY_MAJOR_VERSION=3 \ - RUBY_MINOR_VERSION=1 - -ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \ - RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}" - -ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \ - IMAGE_NAME="ubi8/ruby-${RUBY_SCL_NAME_VERSION}" \ - SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \ - DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \ -building and running various Ruby $RUBY_VERSION applications and frameworks. \ -Ruby is the interpreted scripting language for quick and easy object-oriented programming. \ -It has many features to process text files and to do system management tasks (as in Perl). \ -It is simple, straight-forward, and extensible." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Ruby ${RUBY_VERSION}" \ - io.openshift.expose-services="8080:http" \ - io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \ - com.redhat.component="${RUBY_SCL}-container" \ - name="${IMAGE_NAME}" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ - usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \ ---context-dir=${RUBY_VERSION}/test/puma-test-app/ ${IMAGE_NAME} ruby-sample-app" \ - maintainer="SoftwareCollections.org " - -RUN yum -y module enable ruby:$RUBY_VERSION && \ - INSTALL_PKGS=" \ - libffi-devel \ - ruby \ - ruby-devel \ - rubygem-rake \ - rubygem-bundler \ - ruby-bundled-gems \ - redhat-rpm-config \ - " && \ - yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ - yum -y clean all --enablerepo='*' && \ - ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \ - rpm -V ${INSTALL_PKGS} - -# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Copy extra files to the image. -COPY ./root/ / - -# Drop the root user and make the content of /opt/app-root owned by user 1001 -RUN chown -R 1001:0 ${APP_ROOT} && chmod -R ug+rwx ${APP_ROOT} && \ - rpm-file-permissions - -USER 1001 - -# Set the default CMD to print the usage of the language image -CMD $STI_SCRIPTS_PATH/usage diff --git a/3.1/Dockerfile.rhel9 b/3.1/Dockerfile.rhel9 deleted file mode 100644 index 969fe2a5..00000000 --- a/3.1/Dockerfile.rhel9 +++ /dev/null @@ -1,65 +0,0 @@ -FROM ubi9/s2i-base - -# This image provides a Ruby environment you can use to run your Ruby -# applications. - -EXPOSE 8080 - -ENV RUBY_MAJOR_VERSION=3 \ - RUBY_MINOR_VERSION=1 - -ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \ - RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}" - -ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \ - IMAGE_NAME="ubi9/ruby-${RUBY_SCL_NAME_VERSION}" \ - SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \ - DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \ -building and running various Ruby $RUBY_VERSION applications and frameworks. \ -Ruby is the interpreted scripting language for quick and easy object-oriented programming. \ -It has many features to process text files and to do system management tasks (as in Perl). \ -It is simple, straight-forward, and extensible." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Ruby ${RUBY_VERSION}" \ - io.openshift.expose-services="8080:http" \ - io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \ - com.redhat.component="${RUBY_SCL}-container" \ - name="${IMAGE_NAME}" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ - usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \ ---context-dir=${RUBY_VERSION}/test/puma-test-app/ ${IMAGE_NAME} ruby-sample-app" \ - maintainer="SoftwareCollections.org " - -RUN yum -y module enable ruby:$RUBY_VERSION && \ - INSTALL_PKGS=" \ - libffi-devel \ - ruby \ - ruby-devel \ - rubygem-rake \ - rubygem-bundler \ - ruby-bundled-gems \ - redhat-rpm-config \ - " && \ - yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ - yum -y clean all --enablerepo='*' && \ - ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \ - rpm -V ${INSTALL_PKGS} - -# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Copy extra files to the image. -COPY ./root/ / - -# Drop the root user and make the content of /opt/app-root owned by user 1001 -RUN chown -R 1001:0 ${APP_ROOT} && chmod -R ug+rwx ${APP_ROOT} && \ - rpm-file-permissions - -USER 1001 - -# Set the default CMD to print the usage of the language image -CMD $STI_SCRIPTS_PATH/usage diff --git a/3.1/README.md b/3.1/README.md deleted file mode 100644 index 724bb3e7..00000000 --- a/3.1/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Ruby 3.1 container image -======================== - -**The Ruby 3.1 image is deprecated.** \ No newline at end of file diff --git a/3.1/root/opt/app-root/.gemrc b/3.1/root/opt/app-root/.gemrc deleted file mode 100644 index 2422bea3..00000000 --- a/3.1/root/opt/app-root/.gemrc +++ /dev/null @@ -1,9 +0,0 @@ ---- -install: --no-document -update: --no-document -:benchmark: false -:update_sources: true -:bulk_threshold: 1000 -:backtrace: true -:sources: -- https://rubygems.org/ diff --git a/3.1/root/opt/app-root/etc/puma.cfg b/3.1/root/opt/app-root/etc/puma.cfg deleted file mode 100644 index a52d26dc..00000000 --- a/3.1/root/opt/app-root/etc/puma.cfg +++ /dev/null @@ -1,50 +0,0 @@ -def get_max_memory() - return ENV['MEMORY_LIMIT_IN_BYTES'].to_i if ENV.has_key? 'MEMORY_LIMIT_IN_BYTES' - - # Assume unlimited memory. 0.size is the number of bytes a Ruby - # Fixnum class can hold. One bit is used for sign and one is used - # by Ruby to determine whether it's a number or pointer to an object. - # That's why we subtract two bits. This expresion should therefore be - # the largest signed Fixnum possible. - (2 ** (8*0.size - 2) - 1) -end - -def get_memory_per_worker() - bytes = ENV.fetch('MEMORY_BYTES_PER_WORKER', '0').to_i - if bytes == 0 - # Comment describing rationale for choosing default of 256MiB/worker is below. - bytes = 256 * (2**20) - end - bytes -end - -def get_min_threads() - ENV.fetch('PUMA_MIN_THREADS', '0').to_i -end - -def get_max_threads() - ENV.fetch('PUMA_MAX_THREADS', '16').to_i -end - -# Determine the maximum number of workers that are allowed by the available -# memory. Puma documentation recommends the maximum number of workers to be -# set to the number of cores. -# Unless we're specifically tuned otherwise, allow one worker process per 256MiB -# memory, to a maximum of 1 worker / core. Hopefully that'll be a reasonable -# starting point for average apps; if not, it's all tunable. The simple -# OpenShift ruby/rails sample app currently requires approx. 60MiB + -# 70MiB/worker before taking its first request, so hopefully a default of -# 256MiB/worker will give other simple apps reasonable default headroom. -def get_workers() - return ENV['PUMA_WORKERS'].to_i if ENV.has_key? 'PUMA_WORKERS' - - cores = ENV.fetch('NUMBER_OF_CORES', '1').to_i - max_workers = get_max_memory() / get_memory_per_worker() - - [cores, max_workers].min -end - -environment ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'production' -threads get_min_threads(), get_max_threads() -workers get_workers() -bind 'tcp://0.0.0.0:8080' diff --git a/3.1/s2i/bin/assemble b/3.1/s2i/bin/assemble deleted file mode 100755 index 5c9d32d4..00000000 --- a/3.1/s2i/bin/assemble +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -function rake_assets_precompile() { - [[ "$DISABLE_ASSET_COMPILATION" == "true" ]] && return - [ ! -f Gemfile ] && return - [ ! -f Rakefile ] && return - ! grep " rake " Gemfile.lock >/dev/null && return - ! bundle exec 'rake -T' | grep "assets:precompile" >/dev/null && return - - echo "---> Starting asset compilation ..." - bundle exec "rake assets:precompile" -} - -set -e - -export RACK_ENV=${RACK_ENV:-"production"} - -if [ -n "$RUBYGEM_MIRROR" ]; then - bundle config mirror.https://rubygems.org $RUBYGEM_MIRROR -fi - -shopt -s dotglob -echo "---> Installing application source ..." -mv /tmp/src/* ./ - -# Change the npm registry mirror if provided -if [ -n "$NPM_MIRROR" ]; then - npm config set registry $NPM_MIRROR -fi - -echo "---> Building your Ruby application from source ..." -if [ -f Gemfile ]; then - ADDTL_BUNDLE_ARGS="--retry 2" - if [ -f Gemfile.lock ]; then - bundle config set --local deployment "true" - fi - - if [[ "$RAILS_ENV" == "development" || "$RACK_ENV" == "development" ]]; then - BUNDLE_WITHOUT=${BUNDLE_WITHOUT:-"test"} - elif [[ "$RAILS_ENV" == "test" || "$RACK_ENV" == "test" ]]; then - BUNDLE_WITHOUT=${BUNDLE_WITHOUT:-"development"} - else - BUNDLE_WITHOUT=${BUNDLE_WITHOUT:-"development:test"} - fi - - if [ -n "$BUNDLE_WITHOUT" ]; then - bundle config set --local without "$BUNDLE_WITHOUT" - fi - - echo "---> Running 'bundle install ${ADDTL_BUNDLE_ARGS}' ..." - bundle config set --local path "./bundle" - bundle install ${ADDTL_BUNDLE_ARGS} - - echo "---> Cleaning up unused ruby gems ..." - bundle clean --verbose -fi - -if ! bundle exec rackup -h &>/dev/null; then - echo "WARNING: Rubygem Rack is not installed in the present image." - echo " Add rack to your Gemfile in order to start the web server." -fi - -if [[ "$RAILS_ENV" == "production" || "$RACK_ENV" == "production" ]]; then - rake_assets_precompile -fi - -# Fix source directory permissions -fix-permissions ./ diff --git a/3.1/s2i/bin/run b/3.1/s2i/bin/run deleted file mode 100755 index 1614ec3b..00000000 --- a/3.1/s2i/bin/run +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -function is_puma_installed() { - [ ! -f Gemfile.lock ] && return 1 - grep ' puma ' Gemfile.lock >/dev/null -} - -set -e - -function check_number() { - if [[ ! "$2" =~ ^[0-9]+$ ]]; then - echo "$1 needs to be a non-negative number" - exit 1 - fi -} -check_number PUMA_WORKERS "${PUMA_WORKERS:-0}" -check_number PUMA_MIN_THREADS "${PUMA_MIN_THREADS:-0}" -check_number PUMA_MAX_THREADS "${PUMA_MAX_THREADS:-0}" - -export RACK_ENV=${RACK_ENV:-"production"} - -if is_puma_installed; then - export_vars=$(cgroup-limits) ; export $export_vars - - exec bundle exec "puma --config ../etc/puma.cfg" -else - echo "You might consider adding 'puma' into your Gemfile." - - if bundle exec rackup -h &>/dev/null; then - if [ -f Gemfile ]; then - exec bundle exec "rackup -E ${RAILS_ENV:-$RACK_ENV} -P /tmp/rack.pid --host 0.0.0.0 --port 8080" - else - exec rackup -E "${RAILS_ENV:-$RACK_ENV}" -P /tmp/rack.pid --host 0.0.0.0 --port 8080 - fi - else - echo "ERROR: Rubygem Rack is not installed in the present image." - echo " Add rack to your Gemfile in order to start the web server." - fi -fi diff --git a/3.1/s2i/bin/usage b/3.1/s2i/bin/usage deleted file mode 100755 index 76b9beb1..00000000 --- a/3.1/s2i/bin/usage +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -DISTRO="`grep ^ID= /etc/*-release | cut -d'"' -f2`" - -cat < -- curl 127.0.0.1:8080 - -Alternatively, to run the image directly using podman or docker, or how to use it as a parent image in a Dockerfile, see documentation at - -https://github.com/sclorg/s2i-ruby-container/blob/master/${RUBY_VERSION}/README.md -EOF diff --git a/3.1/test/__init__.py b/3.1/test/__init__.py deleted file mode 120000 index d0f4746a..00000000 --- a/3.1/test/__init__.py +++ /dev/null @@ -1 +0,0 @@ -../../test/__init__.py \ No newline at end of file diff --git a/3.1/test/conftest.py b/3.1/test/conftest.py deleted file mode 120000 index 3f2d7840..00000000 --- a/3.1/test/conftest.py +++ /dev/null @@ -1 +0,0 @@ -../../test/conftest.py \ No newline at end of file diff --git a/3.1/test/examples b/3.1/test/examples deleted file mode 120000 index d15735c1..00000000 --- a/3.1/test/examples +++ /dev/null @@ -1 +0,0 @@ -../../examples \ No newline at end of file diff --git a/3.1/test/imagestreams b/3.1/test/imagestreams deleted file mode 120000 index 7a0aee9c..00000000 --- a/3.1/test/imagestreams +++ /dev/null @@ -1 +0,0 @@ -../../imagestreams \ No newline at end of file diff --git a/3.1/test/puma-test-app/Gemfile b/3.1/test/puma-test-app/Gemfile deleted file mode 100755 index a98e5e1c..00000000 --- a/3.1/test/puma-test-app/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'sinatra' -gem 'puma' diff --git a/3.1/test/puma-test-app/Gemfile.lock b/3.1/test/puma-test-app/Gemfile.lock deleted file mode 100644 index 052f5933..00000000 --- a/3.1/test/puma-test-app/Gemfile.lock +++ /dev/null @@ -1,25 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - mustermann (1.1.1) - ruby2_keywords (~> 0.0.1) - nio4r (2.5.7) - puma (5.2.2) - nio4r (~> 2.0) - rack (2.2.3) - rack-protection (2.1.0) - rack - ruby2_keywords (0.0.4) - sinatra (2.1.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) - tilt (~> 2.0) - tilt (2.0.10) - -PLATFORMS - ruby - -DEPENDENCIES - puma - sinatra diff --git a/3.1/test/puma-test-app/app.rb b/3.1/test/puma-test-app/app.rb deleted file mode 100755 index cd7e87d7..00000000 --- a/3.1/test/puma-test-app/app.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'sinatra' - -get '/' do - 'Hello world!' -end diff --git a/3.1/test/puma-test-app/config.ru b/3.1/test/puma-test-app/config.ru deleted file mode 100755 index 76a6edff..00000000 --- a/3.1/test/puma-test-app/config.ru +++ /dev/null @@ -1,2 +0,0 @@ -require './app' -run Sinatra::Application diff --git a/3.1/test/rack-test-app/Gemfile b/3.1/test/rack-test-app/Gemfile deleted file mode 100755 index d89e792e..00000000 --- a/3.1/test/rack-test-app/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'sinatra' -gem 'webrick' diff --git a/3.1/test/rack-test-app/Gemfile.lock b/3.1/test/rack-test-app/Gemfile.lock deleted file mode 100644 index 883bfb2b..00000000 --- a/3.1/test/rack-test-app/Gemfile.lock +++ /dev/null @@ -1,23 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - mustermann (1.1.1) - ruby2_keywords (~> 0.0.1) - rack (2.2.3) - rack-protection (2.1.0) - rack - ruby2_keywords (0.0.4) - sinatra (2.1.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) - tilt (~> 2.0) - tilt (2.0.10) - webrick (1.7.0) - -PLATFORMS - ruby - -DEPENDENCIES - sinatra - webrick diff --git a/3.1/test/rack-test-app/app.rb b/3.1/test/rack-test-app/app.rb deleted file mode 100755 index cd7e87d7..00000000 --- a/3.1/test/rack-test-app/app.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'sinatra' - -get '/' do - 'Hello world!' -end diff --git a/3.1/test/rack-test-app/config.ru b/3.1/test/rack-test-app/config.ru deleted file mode 100755 index 76a6edff..00000000 --- a/3.1/test/rack-test-app/config.ru +++ /dev/null @@ -1,2 +0,0 @@ -require './app' -run Sinatra::Application diff --git a/3.1/test/run b/3.1/test/run deleted file mode 120000 index 44977d63..00000000 --- a/3.1/test/run +++ /dev/null @@ -1 +0,0 @@ -../../test/run \ No newline at end of file diff --git a/3.1/test/run-openshift-pytest b/3.1/test/run-openshift-pytest deleted file mode 120000 index 5063ae30..00000000 --- a/3.1/test/run-openshift-pytest +++ /dev/null @@ -1 +0,0 @@ -../../test/run-openshift-pytest \ No newline at end of file diff --git a/3.1/test/run-openshift-remote-cluster b/3.1/test/run-openshift-remote-cluster deleted file mode 120000 index 1bffcba8..00000000 --- a/3.1/test/run-openshift-remote-cluster +++ /dev/null @@ -1 +0,0 @@ -../../test/run-openshift-remote-cluster \ No newline at end of file diff --git a/3.1/test/run-pytest b/3.1/test/run-pytest deleted file mode 120000 index efe32b48..00000000 --- a/3.1/test/run-pytest +++ /dev/null @@ -1 +0,0 @@ -../../test/run-pytest \ No newline at end of file diff --git a/3.1/test/test-lib-openshift.sh b/3.1/test/test-lib-openshift.sh deleted file mode 120000 index 4f9f2996..00000000 --- a/3.1/test/test-lib-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/test-lib-openshift.sh \ No newline at end of file diff --git a/3.1/test/test-lib-remote-openshift.sh b/3.1/test/test-lib-remote-openshift.sh deleted file mode 120000 index 92ad2f4d..00000000 --- a/3.1/test/test-lib-remote-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/test-lib-remote-openshift.sh \ No newline at end of file diff --git a/3.1/test/test-lib-ruby.sh b/3.1/test/test-lib-ruby.sh deleted file mode 120000 index ea235094..00000000 --- a/3.1/test/test-lib-ruby.sh +++ /dev/null @@ -1 +0,0 @@ -../../test/test-lib-ruby.sh \ No newline at end of file diff --git a/3.1/test/test-lib.sh b/3.1/test/test-lib.sh deleted file mode 120000 index 1ac99b93..00000000 --- a/3.1/test/test-lib.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/test-lib.sh \ No newline at end of file diff --git a/3.1/test/test-openshift.yaml b/3.1/test/test-openshift.yaml deleted file mode 120000 index 8613fbba..00000000 --- a/3.1/test/test-openshift.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/test-openshift.yaml \ No newline at end of file diff --git a/3.1/test/test_container_application.py b/3.1/test/test_container_application.py deleted file mode 120000 index 25c1c1ec..00000000 --- a/3.1/test/test_container_application.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_container_application.py \ No newline at end of file diff --git a/3.1/test/test_container_basics.py b/3.1/test/test_container_basics.py deleted file mode 120000 index b85dc139..00000000 --- a/3.1/test/test_container_basics.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_container_basics.py \ No newline at end of file diff --git a/3.1/test/test_container_fips.py b/3.1/test/test_container_fips.py deleted file mode 120000 index b06669f3..00000000 --- a/3.1/test/test_container_fips.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_container_fips.py \ No newline at end of file diff --git a/3.1/test/test_ocp_helm_ruby_imagestreams.py b/3.1/test/test_ocp_helm_ruby_imagestreams.py deleted file mode 120000 index 998c113c..00000000 --- a/3.1/test/test_ocp_helm_ruby_imagestreams.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_helm_ruby_imagestreams.py \ No newline at end of file diff --git a/3.1/test/test_ocp_helm_ruby_rails_application.py b/3.1/test/test_ocp_helm_ruby_rails_application.py deleted file mode 120000 index aa7e5df2..00000000 --- a/3.1/test/test_ocp_helm_ruby_rails_application.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_helm_ruby_rails_application.py \ No newline at end of file diff --git a/3.1/test/test_ocp_ruby_ex_standalone.py b/3.1/test/test_ocp_ruby_ex_standalone.py deleted file mode 120000 index 42ee4afc..00000000 --- a/3.1/test/test_ocp_ruby_ex_standalone.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_ruby_ex_standalone.py \ No newline at end of file diff --git a/3.1/test/test_ocp_ruby_latest_imagestreams.py b/3.1/test/test_ocp_ruby_latest_imagestreams.py deleted file mode 120000 index 247808c0..00000000 --- a/3.1/test/test_ocp_ruby_latest_imagestreams.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_ruby_latest_imagestreams.py \ No newline at end of file diff --git a/3.1/test/test_ocp_s2i_imagestreams.py b/3.1/test/test_ocp_s2i_imagestreams.py deleted file mode 120000 index 3c4b5d99..00000000 --- a/3.1/test/test_ocp_s2i_imagestreams.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_s2i_imagestreams.py \ No newline at end of file diff --git a/3.1/test/test_ocp_s2i_integration.py b/3.1/test/test_ocp_s2i_integration.py deleted file mode 120000 index 01bb85c5..00000000 --- a/3.1/test/test_ocp_s2i_integration.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_s2i_integration.py \ No newline at end of file diff --git a/3.1/test/test_ocp_s2i_templates.py b/3.1/test/test_ocp_s2i_templates.py deleted file mode 120000 index 5932fc15..00000000 --- a/3.1/test/test_ocp_s2i_templates.py +++ /dev/null @@ -1 +0,0 @@ -../../test/test_ocp_s2i_templates.py \ No newline at end of file diff --git a/examples/from-dockerfile/Dockerfile b/examples/from-dockerfile/Dockerfile index 66c66e39..f6e39450 100644 --- a/examples/from-dockerfile/Dockerfile +++ b/examples/from-dockerfile/Dockerfile @@ -1,4 +1,4 @@ -FROM ubi8/ruby-31 +FROM ubi8/ruby-33 ADD --chown=default:root app-src ./ diff --git a/examples/from-dockerfile/Dockerfile.s2i b/examples/from-dockerfile/Dockerfile.s2i index e2df5ae2..fb9a89f1 100644 --- a/examples/from-dockerfile/Dockerfile.s2i +++ b/examples/from-dockerfile/Dockerfile.s2i @@ -1,4 +1,4 @@ -FROM ubi8/ruby-31 +FROM ubi8/ruby-33 # Add application sources to a directory that the assemble script expects them # and set permissions so that the container runs without root access diff --git a/test/test_ocp_helm_ruby_imagestreams.py b/test/test_ocp_helm_ruby_imagestreams.py index f3217ac4..1702ebd1 100644 --- a/test/test_ocp_helm_ruby_imagestreams.py +++ b/test/test_ocp_helm_ruby_imagestreams.py @@ -30,8 +30,6 @@ def teardown_method(self): ("3.3-ubi10", "registry.redhat.io/ubi10/ruby-33:latest", True), ("3.3-ubi9", "registry.redhat.io/ubi9/ruby-33:latest", True), ("3.3-ubi8", "registry.redhat.io/ubi8/ruby-33:latest", True), - ("3.1-ubi9", "registry.redhat.io/ubi9/ruby-31:latest", False), - ("3.1-ubi8", "registry.redhat.io/ubi8/ruby-31:latest", False), ("3.0-ubi9", "registry.redhat.io/ubi9/ruby-30:latest", True), ("3.0-ubi8", "registry.redhat.io/ubi8/ruby-30:latest", False), ("2.5-ubi8", "registry.redhat.io/ubi8/ruby-25:latest", True), From 3f37099d1b0747af09f0e91b75a1dc97d457d3b6 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Tue, 13 Jan 2026 11:34:20 +0100 Subject: [PATCH 2/2] Fix the conftest rails-ex branch switch. When translating the bash to python, the bash condition was '<= 3.1', not '< 3.1', therefore the range inversion is '> 3.1'. Since we also removed the 3.1, just bump it properly to '>= 3.3'. --- test/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conftest.py b/test/conftest.py index 61809f5f..d7ec9606 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -52,7 +52,7 @@ PSQL_IMAGE_SHORT = f"postgresql:12{PSQL_TAG}" PSQL_IMAGE_TAG = f"12{PSQL_TAG}" TEST_APP_BRANCH = "master" -if VERSION and float(VERSION) >= 3.1: +if VERSION and float(VERSION) >= 3.3: TEST_APP_BRANCH = "3.3" DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-12-c8s" VARS = Vars(