THREESCALE-11575: Upgrade to CentOS stream9 #3866

mayorova · 2024-08-14T15:26:24Z

The corresponding builder image is: 3scale/system-builder#42

jlledom · 2024-08-21T13:02:53Z

openshift/system/Dockerfile

@@ -109,7 +107,7 @@ ENV THINKING_SPHINX_ADDRESS=0.0.0.0 \
    SECRET_KEY_BASE=dummy \
    DATABASE_URL='mysql2://root:@localhost/porta'
 USER 0
-RUN dnf install -y mysql-server mysql-test \
+RUN dnf install --enablerepo=crb -y mysql-server mysql-test \


What is this for?

mysql package is in this repo that is available but not enabled by default

github-actions · 2024-10-20T03:39:41Z

This PR is stale because it has not received activity for more than 30 days. Remove stale label or comment or this will be closed in 15 days.

github-actions · 2024-12-06T03:42:23Z

This PR is stale because it has not received activity for more than 30 days. Remove stale label or comment or this will be closed in 15 days.

akostadinov · 2025-01-08T15:59:13Z

openshift/system/Dockerfile

-    && dnf -y --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 mysql:8.0 \
-    && dnf install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info make automake gcc gcc-c++ redhat-rpm-config postgresql rubygem-irb rubygem-rdoc ruby-devel nodejs libpq-devel mysql-devel gd-devel libxml2-devel libxslt-devel git 'dnf-command(download)' podman-catatonit \
+RUN dnf -y --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 mysql:8.0 \
+    && dnf install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs --enablerepo=crb shared-mime-info make automake gcc gcc-c++ postgresql rubygem-irb rubygem-rdoc ruby-devel nodejs libpq-devel mysql-devel gd-devel libxml2-devel libxslt-devel git 'dnf-command(download)' podman-catatonit \


There is a comment later in the file

RHEL 9 simply use package catatonit

So we don't need podman-catatonit here. Should be removed. And then in base layer add catatonit to the dnf installcommand. Also removeCOPY --from=builder /usr/libexec/catatonit/catatonit /usr/libexec/catatonit/catatonit`

Then maybe ENTRYPOINT will also need to be adjusted 👼

all else looks great!

@akostadinov the entrypoint remained the same, the package installs the catatonit executable to /usr/libexec/catatonit/catatonit

I hope it didn't pull the whole podman group as well :)

jlledom

It looks correct to me, but should the base image also be updated to centos stream 9?

mayorova · 2025-01-09T15:21:37Z

It looks correct to me, but should the base image also be updated to centos stream 9?

Yes, of course it should 😉 Thanks!

mayorova · 2025-01-09T15:52:35Z

openshift/system/Dockerfile

-    && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
-    && dnf -y --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 mysql:8.0 \
-    && dnf install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info make automake gcc gcc-c++ redhat-rpm-config postgresql rubygem-irb rubygem-rdoc ruby-devel nodejs libpq-devel mysql-devel gd-devel libxml2-devel libxslt-devel git 'dnf-command(download)' podman-catatonit \
+RUN dnf -y --enablerepo=crb --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 \


added --enablerepo=crb and removed mysql:8.0 module

mayorova · 2025-01-09T15:53:04Z

openshift/system/Dockerfile

-    && dnf -y --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 mysql:8.0 \
-    && dnf install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info make automake gcc gcc-c++ redhat-rpm-config postgresql rubygem-irb rubygem-rdoc ruby-devel nodejs libpq-devel mysql-devel gd-devel libxml2-devel libxslt-devel git 'dnf-command(download)' podman-catatonit \
+RUN dnf -y --enablerepo=crb --setopt=module_stream_switch=True module enable ruby:${RUBY_VERSION} nodejs:18 \
+    && dnf install -y --enablerepo=crb --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info make automake gcc gcc-c++ postgresql rubygem-irb rubygem-rdoc ruby-devel nodejs libpq-devel mysql-devel gd-devel libxml2-devel libxslt-devel git 'dnf-command(download)' cpio \


in the dnf install command - added --enablerepo=crb and cpio package, removed podman-catatonit

jusr curious why do we need cpio

we use cpio to copy some memkind sources. I guess the executable was present in stream8 but got removed from stream9 🤷

mayorova · 2025-01-09T15:53:26Z

openshift/system/Dockerfile

-    && dnf -y module enable ruby:${RUBY_VERSION} nodejs:18 mysql:8.0 \
-    && dnf install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info postgresql rubygem-irb rubygem-rdoc ruby libpq mysql mysql-libs gd git liberation-sans-fonts file libxml2 libxslt \
+RUN dnf -y --enablerepo=crb module enable ruby:${RUBY_VERSION} nodejs:18 \
+    && dnf install -y --enablerepo=crb --setopt=skip_missing_names_on_install=False,tsflags=nodocs shared-mime-info postgresql rubygem-irb rubygem-rdoc ruby libpq mysql mysql-libs gd git liberation-sans-fonts file libxml2 libxslt catatonit \


added --enablerepo=crb and catatonit package

akostadinov

Looks awesome!

jlledom

It looks correct to me. I launched tests also for oracle and postgres, I think they are relevant for this PR.

codecov · 2025-01-10T12:38:22Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.78%. Comparing base (42acfd9) to head (70a5ec1).
Report is 11 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3866      +/-   ##
==========================================
- Coverage   93.78%   93.78%   -0.01%     
==========================================
  Files        2999     2999              
  Lines       96806    96651     -155     
  Branches      629      629              
==========================================
- Hits        90791    90644     -147     
+ Misses       5991     5983       -8     
  Partials       24       24

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mayorova mentioned this pull request Aug 14, 2024

Ruby3.1 based on CentOS stream9 with Chrome 126 3scale/system-builder#41

Closed

jlledom reviewed Aug 21, 2024

View reviewed changes

mayorova force-pushed the ruby-3.1 branch 4 times, most recently from 52431d5 to 1de699d Compare September 19, 2024 09:38

Base automatically changed from ruby-3.1 to master September 19, 2024 12:15

github-actions bot added the Stale label Oct 20, 2024

github-actions bot closed this Nov 5, 2024

akostadinov removed the Stale label Nov 5, 2024

akostadinov reopened this Nov 5, 2024

github-actions bot added the Stale label Dec 6, 2024

github-actions bot closed this Dec 22, 2024

akostadinov reopened this Dec 22, 2024

github-actions bot removed the Stale label Dec 23, 2024

mayorova force-pushed the ruby-3.1-stream9 branch 2 times, most recently from e3ae3f5 to 3f2dfb3 Compare January 8, 2025 15:40

mayorova changed the title ~~[WIP] Upgrade to CentOS stream9~~ Upgrade to CentOS stream9 Jan 8, 2025

mayorova changed the title ~~Upgrade to CentOS stream9~~ THREESCALE-11575: Upgrade to CentOS stream9 Jan 8, 2025

mayorova marked this pull request as ready for review January 8, 2025 15:58

akostadinov reviewed Jan 8, 2025

View reviewed changes

jlledom reviewed Jan 9, 2025

View reviewed changes

mayorova force-pushed the ruby-3.1-stream9 branch from 3f2dfb3 to 2fc9a3f Compare January 9, 2025 15:25

Upgrade builder image to CentOS stream9

70a5ec1

mayorova force-pushed the ruby-3.1-stream9 branch from 2fc9a3f to 70a5ec1 Compare January 9, 2025 15:51

mayorova commented Jan 9, 2025

View reviewed changes

akostadinov approved these changes Jan 9, 2025

View reviewed changes

jlledom approved these changes Jan 10, 2025

View reviewed changes

mayorova merged commit 5562acb into master Jan 13, 2025
35 checks passed

mayorova deleted the ruby-3.1-stream9 branch January 13, 2025 15:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

THREESCALE-11575: Upgrade to CentOS stream9 #3866

THREESCALE-11575: Upgrade to CentOS stream9 #3866

mayorova commented Aug 14, 2024 •

edited

Loading

jlledom Aug 21, 2024

akostadinov Aug 22, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Dec 6, 2024

akostadinov Jan 8, 2025

akostadinov Jan 8, 2025

mayorova Jan 9, 2025

akostadinov Jan 9, 2025

jlledom left a comment •

edited

Loading

mayorova commented Jan 9, 2025

mayorova Jan 9, 2025

mayorova Jan 9, 2025

akostadinov Jan 9, 2025

mayorova Jan 9, 2025

mayorova Jan 9, 2025

akostadinov left a comment

jlledom left a comment

codecov bot commented Jan 10, 2025 •

edited

Loading

THREESCALE-11575: Upgrade to CentOS stream9 #3866

THREESCALE-11575: Upgrade to CentOS stream9 #3866

Conversation

mayorova commented Aug 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Oct 20, 2024

github-actions bot commented Dec 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jlledom left a comment • edited Loading

Choose a reason for hiding this comment

mayorova commented Jan 9, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akostadinov left a comment

Choose a reason for hiding this comment

jlledom left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 10, 2025 • edited Loading

Codecov Report

mayorova commented Aug 14, 2024 •

edited

Loading

jlledom left a comment •

edited

Loading

codecov bot commented Jan 10, 2025 •

edited

Loading