Skip to content

Commit d3b3f49

Browse files
committed
Remove mentions of CentOS 7 and remove RHEL 7-related comments in the tests
1 parent adcc1dc commit d3b3f49

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ install:
2121
script:
2222
# Unset an environment variable that causes failure in test.
2323
- unset RUBY_VERSION
24-
- SKIP_SQUASH=1 make test TARGET=centos7
24+
- SKIP_SQUASH=1 make test TARGET=c10s

3.3/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Ruby 3.3 container image
33
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.
44
Users can choose between RHEL, CentOS Stream and Fedora based builder images.
55
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
6-
the CentOS Stream images are available on [Quay.io](https://quay.io/organization/centos7),
6+
the CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg),
77
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
88
The resulting image can be run using [podman](https://github.com/containers/libpod).
99

test/run

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,9 @@ function test_from_dockerfile() {
137137
info "Check building using a $dockerfile"
138138

139139
# Ruby 3.3 introduced too many incompatibilities to be able
140-
# to use the same Gemfile for RHEL 7 and also newer RHELs.
141-
# we can use the same Gemfile for RHEL 7 and newer
142-
# as long as Ruby MAJOR.MINOR <= 3.1. Newer Ruby needs dependencies
143-
# that are not compatible with RHEL 7.
140+
# to use the same Gemfile as for the previous versions.
141+
# We can use the same Gemfile for RHEL 8, 9, and 10
142+
# as long as Ruby MAJOR.MINOR <= 3.1.
144143

145144
# Latest stable
146145
rails_example_repo_branch="3.3"

test/test-lib-ruby.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ source "${THISDIR}/test-lib.sh"
1212
source "${THISDIR}/test-lib-openshift.sh"
1313

1414
function ct_pull_or_import_postgresql() {
15-
postgresql_image="quay.io/sclorg/postgresql-12-c8s"
16-
image_short="postgresql:12"
15+
postgresql_image="quay.io/sclorg/postgresql-16-c10s"
16+
image_short="postgresql:16"
1717
image_tag="${image_short}"
1818
# Variable CVP is set by CVP pipeline
1919
if [ "${CVP:-0}" -eq "0" ]; then
@@ -22,19 +22,18 @@ function ct_pull_or_import_postgresql() {
2222
# Exit in case of failure, because postgresql container is mandatory
2323
ct_pull_image "${postgresql_image}" "true"
2424
else
25-
# Import postgresql-10-centos7 image before running tests on CVP
25+
# Import postgresql-16-c10s image before running tests on CVP
2626
oc import-image "${image_short}:latest" --from="${postgresql_image}:latest" --insecure=true --confirm
27-
# Tag postgresql image to "postgresql:10" which is expected by test suite
27+
# Tag postgresql image to "postgresql:16" which is expected by test suite
2828
oc tag "${image_short}:latest" "${image_tag}"
2929
fi
3030
}
3131

3232
function rails_ex_branch() {
3333
# Ruby 3.3 introduced too many incompatibilities to be able
34-
# to use the same Gemfile for RHEL 7 and also newer RHELs.
35-
# we can use the same Gemfile for RHEL 7 and newer
36-
# as long as Ruby MAJOR.MINOR <= 3.1. Newer Ruby needs dependencies
37-
# that are not compatible with RHEL 7.
34+
# to use the same Gemfile as for the previous versions.
35+
# We can use the same Gemfile for RHEL 8, 9, and 10
36+
# as long as Ruby MAJOR.MINOR <= 3.1.
3837

3938
# Latest stable
4039
rails_example_repo_branch="3.3"

0 commit comments

Comments
 (0)