Skip to content

Fix regular expression used for proper imagestream #252

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
Jun 2, 2025
Merged

Fix regular expression used for proper imagestream #252

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
fa6520c
Fix regular expression used for proper imagestream.
phracek Jun 2, 2025
cc0d4f2
Fix PyTest test suite. Enable support testing
phracek Jun 2, 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
7 changes: 1 addition & 6 deletions test/test-lib-httpd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ function test_httpd_integration() {

# Check the imagestream
function test_httpd_imagestream() {
case ${OS} in
rhel8|rhel9) ;;
*) echo "Imagestream testing not supported for $OS environment." ; return 0 ;;
esac

ct_os_test_image_stream_s2i "${THISDIR}/imagestreams/httpd-${OS%[0-9]*}.json" "${IMAGE_NAME}" \
ct_os_test_image_stream_s2i "${THISDIR}/imagestreams/httpd-${OS//[0-9]/}.json" "${IMAGE_NAME}" \
"https://github.com/sclorg/httpd-container.git" \
"examples/sample-test-app" \
"This is a sample s2i application with static content"
Expand Down
2 changes: 0 additions & 2 deletions test/test_httpd_imagestream_s2i.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ def teardown_method(self):
self.oc_api.delete_project()

def test_inside_cluster(self):
if VERSION == "rhel10":
pytest.skip("Do NOT test on RHEL10.")
os_name = ''.join(i for i in OS if not i.isdigit())
assert self.oc_api.deploy_imagestream_s2i(
imagestream_file=f"imagestreams/httpd-{os_name}.json",
Expand Down
2 changes: 2 additions & 0 deletions test/test_httpd_shared_helm_imagestreams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ def teardown_method(self):
@pytest.mark.parametrize(
"version,registry",
[
("2.4-ubi10", "registry.redhat.io/ubi10/httpd-24:latest"),
("2.4-ubi9", "registry.redhat.io/ubi9/httpd-24:latest"),
("2.4-ubi8", "registry.redhat.io/ubi8/httpd-24:latest"),
("2.4-el8", "registry.redhat.io/rhel8/httpd-24"),
("2.4-el9", "registry.redhat.io/rhel9/httpd-24"),
("2.4-el10", "registry.redhat.io/rhel10/httpd-24"),
],
)
def test_package_imagestream(self, version, registry):
Expand Down
30 changes: 3 additions & 27 deletions test/test_httpd_shared_helm_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

TAGS = {
"rhel8": "-el8",
"rhel9": "-el9"
"rhel9": "-el9",
"rhel10": "-el10"
}

TAG = TAGS.get(OS, None)
TAG = TAGS.get(OS)


class TestHelmHTTPDTemplate:
Expand All @@ -34,32 +35,7 @@ def setup_method(self):
def teardown_method(self):
self.hc_api.delete_project()

def test_package_persistent_by_curl(self):
if self.hc_api.oc_api.shared_cluster:
pytest.skip("Do NOT test on shared cluster")
new_version = VERSION
if "micro" in VERSION:
new_version = VERSION.replace("-micro", "")
self.hc_api.package_name = "redhat-httpd-imagestreams"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation()
self.hc_api.package_name = "redhat-httpd-template"
assert self.hc_api.helm_package()
assert self.hc_api.helm_installation(
values={
"httpd_version": f"{new_version}{TAG}",
"namespace": self.hc_api.namespace
}
)
assert self.hc_api.is_s2i_pod_running(pod_name_prefix="httpd-example")
assert self.hc_api.oc_api.check_response_inside_cluster(
name_in_template="httpd-example",
expected_output="Welcome to your static httpd application on OpenShift"
)

def test_package_persistent_by_helm_chart_test(self):
if OS == "rhel10":
pytest.skip("Do NOT test on RHEL10.")
new_version = VERSION
if "micro" in VERSION:
new_version = VERSION.replace("-micro", "")
Expand Down