Skip to content

Add support for RHEL10 in test-openshift.yaml files #87

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.

Sign up for GitHub

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

Merged
phracek merged 2 commits into from
Feb 17, 2025
Merged

Add support for RHEL10 in test-openshift.yaml files #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b11f0
Add support for RHEL10 in test-openshift.yaml files
phracek Feb 17, 2025
cdbf163
Fix test suite
phracek Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
dockerfiles: ./Dockerfile.generator
image: cwt-generator
tags: latest 1 ${{ github.sha }} 1.5.10
tags: latest 1 ${{ github.sha }} 1.5.11

- name: Push cwt-generator image to Quay.io
id: push-to-quay
Expand Down
10 changes: 4 additions & 6 deletions container_workflow_tool/git_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,11 @@ def update_test_openshift_yaml(self, test_openshift_yaml, version: str = "", sho
with open(test_openshift_yaml) as f:
fdata = f.read()
fdata = self.update_variable_in_string(fdata, "VERSION", "VERSION_NUMBER", version)
os_name = "fedora"
if self.conf.image_names == "RHEL8":
os_name = "rhel8"
elif self.conf.image_names == "RHEL9":
os_name = "rhel8"
if self.conf.image_names == "RHEL9":
os_name = "rhel9"
elif self.conf.image_names == "RHSCL":
os_name = "rhel7"
elif self.conf.image_names == "RHEL10":
os_name = "rhel10"
fdata = self.update_variable_in_string(fdata, tag="OS", tag_str="OS_NUMBER", variable=os_name)
fdata = self.update_variable_in_string(fdata, tag="SHORT_NAME", tag_str="CONTAINER_NAME", variable=short_name)
with open(test_openshift_yaml, 'w') as f:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def get_dir(system_path=None, virtual_path=None):

setup(
name='container-workflow-tool',
version="1.5.10",
version="1.5.11",
description='A python3 tool to make rebuilding images easier by automating several steps of the process.',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down
4 changes: 1 addition & 3 deletions tests/test_git_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@ def test_distgit_commit_msg(self):
@pytest.mark.parametrize(
"os_name,os_name_expected,version",
[
("fedora", "fedora", "base"),
("RHEL8", "rhel8", "1.14"),
("RHEL9", "rhel9", "1.14"),
("RHSCL", "rhel7", "14"),
("FOO", "fedora", "bar")
("RHEL10", "rhel10", "1.14"),
]
)
def test_update_openshift_yaml(self, os_name, os_name_expected, version):
Expand Down