Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ruby OpenShift 4 tests suite and and 3.3 imagestreams #540

Merged
merged 3 commits into from
May 22, 2024

Conversation

phracek
Copy link
Member

@phracek phracek commented May 16, 2024

This pull request fixes OpenShift 4 tests for version 3.3.
In case ruby 3.3 is tested, then use rails-ex#3.3 branch as well.

In this pull request are updated also 3.3 imagestreams

@phracek
Copy link
Member Author

phracek commented May 16, 2024

[test-openshift]

@phracek
Copy link
Member Author

phracek commented May 16, 2024

@zmiklank @jackorp Review please

test/test-lib-ruby.sh Outdated Show resolved Hide resolved
Set VERSION to unset in 3.3/Dockerfile.fedora

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
@phracek phracek force-pushed the support_openshift_4_ruby_33 branch from b37b3b4 to fa0cce4 Compare May 16, 2024 11:20
@phracek
Copy link
Member Author

phracek commented May 16, 2024

#530

@phracek
Copy link
Member Author

phracek commented May 16, 2024

[test-all]

@phracek
Copy link
Member Author

phracek commented May 16, 2024

Settings variable to 'VERSION=' or 'VERSION=""' cause a problems in our testing suite. See here: https://github.com/sclorg/container-common-scripts/blob/master/tag.sh#L35

it raises an exception like:

Tagged versions are: 3.3
-> Tagging image 'b69c9f006c16b7afebf3f6a50559143f962ae3c62cffcd90389e73f4169e6b02' as 'quay.io/fedora/ruby-33:' and 'quay.io/fedora/ruby-33:latest' and 'quay.io/fedora/ruby-33:fedora' and 'quay.io/fedora/ruby-33:20240516-acc810b'
Error: normalizing name "quay.io/fedora/ruby-33:": normalizing name "quay.io/fedora/ruby-33:": invalid reference format

We need to change this row https://github.com/sclorg/container-common-scripts/blob/master/tag.sh#L35
in case we want to setup VERSION to unset. It is used in labels here: https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/Dockerfile.fedora#L28

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
@phracek phracek force-pushed the support_openshift_4_ruby_33 branch from acc810b to 883c4be Compare May 17, 2024 12:54
@phracek
Copy link
Member Author

phracek commented May 17, 2024

[test-all]

@jackorp
Copy link
Contributor

jackorp commented May 21, 2024

Can't see anything weird that would hit me in the eyes. LGTM. Thanks.

Co-authored-by: Zuzana Miklánková <zmiklank@redhat.com>
@phracek
Copy link
Member Author

phracek commented May 21, 2024

[test-openshift]

Copy link
Member

@zmiklank zmiklank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please try to avoid commit messages like "Update imagestreams/ruby-rhel-aarch64.json". They do not add much value to the commit.

Otherwise LGTM.

@phracek
Copy link
Member Author

phracek commented May 21, 2024

Please try to avoid commit messages like "Update imagestreams/ruby-rhel-aarch64.json". They do not add much value to the commit.

Otherwise LGTM.

This is a message from commit suggestions as soon as I approve.

@zmiklank
Copy link
Member

This is a message from commit suggestions as soon as I approve.

It can be changed before approving and commiting.

@phracek phracek merged commit 8f9a008 into master May 22, 2024
8 checks passed
@phracek phracek deleted the support_openshift_4_ruby_33 branch May 22, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants