Remove mentions of CentOS 7 and remove distinction between RHEL 7 and other releases in the tests

Author: pkhartsk

.travis.yml

@@ -21,4 +21,4 @@ install:
 script:
   # Unset an environment variable that causes failure in test.
   - unset RUBY_VERSION
-  - SKIP_SQUASH=1 make test TARGET=centos7
+  - SKIP_SQUASH=1 make test TARGET=c10s

3.3/README.md

@@ -3,7 +3,7 @@ Ruby 3.3 container image
 This container image includes Ruby 3.3 as a [S2I](https://github.com/openshift/source-to-image) base image for your Ruby 3.3 applications.
 Users can choose between RHEL, CentOS Stream and Fedora based builder images.
 The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
-the CentOS Stream images are available on [Quay.io](https://quay.io/organization/centos7),
+the CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg),
 and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
 The resulting image can be run using [podman](https://github.com/containers/libpod).
 

test/run

@@ -136,18 +136,8 @@ function test_from_dockerfile() {
   TESTCASE_RESULT=0
   info "Check building using a $dockerfile"
 
-  # Ruby 3.3 introduced too many incompatibilities to be able
-  # to use the same Gemfile for RHEL 7 and also newer RHELs.
-  # we can use the same Gemfile for RHEL 7 and newer
-  # as long as Ruby MAJOR.MINOR <= 3.1. Newer Ruby needs dependencies
-  # that are not compatible with RHEL 7.
-
   # Latest stable
   rails_example_repo_branch="3.3"
-  if { echo "$VERSION"; echo "3.1"; } | sort --version-sort --check=quiet; then
-    # Ruby 3.1 and prior.
-    rails_example_repo_branch="master"
-  fi
   rails_example_repo_url="https://github.com/sclorg/rails-ex.git@${rails_example_repo_branch}"
 
   ct_test_app_dockerfile $test_dir/examples/from-dockerfile/$dockerfile "$rails_example_repo_url" 'Welcome to your Rails application on OpenShift' app-src

test/test-lib-ruby.sh

@@ -12,8 +12,8 @@ source "${THISDIR}/test-lib.sh"
 source "${THISDIR}/test-lib-openshift.sh"
 
 function ct_pull_or_import_postgresql() {
-  postgresql_image="quay.io/sclorg/postgresql-12-c8s"
-  image_short="postgresql:12"
+  postgresql_image="quay.io/sclorg/postgresql-16-c10s"
+  image_short="postgresql:16"
   image_tag="${image_short}"
   # Variable CVP is set by CVP pipeline
   if [ "${CVP:-0}" -eq "0" ]; then
@@ -22,27 +22,16 @@ function ct_pull_or_import_postgresql() {
     # Exit in case of failure, because postgresql container is mandatory
     ct_pull_image "${postgresql_image}" "true"
   else
-    # Import postgresql-10-centos7 image before running tests on CVP
+    # Import postgresql-16-c10s image before running tests on CVP
     oc import-image "${image_short}:latest" --from="${postgresql_image}:latest" --insecure=true --confirm
-    # Tag postgresql image to "postgresql:10" which is expected by test suite
+    # Tag postgresql image to "postgresql:16" which is expected by test suite
     oc tag "${image_short}:latest" "${image_tag}"
   fi
 }
 
 function rails_ex_branch() {
-  # Ruby 3.3 introduced too many incompatibilities to be able
-  # to use the same Gemfile for RHEL 7 and also newer RHELs.
-  # we can use the same Gemfile for RHEL 7 and newer
-  # as long as Ruby MAJOR.MINOR <= 3.1. Newer Ruby needs dependencies
-  # that are not compatible with RHEL 7.
-
   # Latest stable
   rails_example_repo_branch="3.3"
-  if { echo "$VERSION"; echo "3.1"; } | sort --version-sort --check=quiet; then
-    # Ruby 3.1 and prior.
-    rails_example_repo_branch="master"
-  fi
-
   echo "$rails_example_repo_branch"
 }