Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/redhat/redhat-python-imagestreams/src/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ annotations:
charts.openshift.io/provider: Red Hat
charts.openshift.io/providerType: redhat
apiVersion: v2
appVersion: 0.0.3
appVersion: 0.0.4
kubeVersion: '>=1.20.0'
name: redhat-python-imagestreams
tags: builder,python
sources:
- https://github.com/sclorg/helm-charts
version: 0.0.3
version: 0.0.4
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,6 @@ spec:
name: registry.redhat.io/ubi8/python-311:latest
referencePolicy:
type: Local
- name: 3.9-ubi8
annotations:
openshift.io/display-name: Python 3.9 (UBI 8)
openshift.io/provider-display-name: Red Hat, Inc.
description: Build and run Python 3.9 applications on UBI 8. For more information
about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.
iconClass: icon-python
tags: builder,python
supports: python:3.9,python
version: '3.9'
sampleRepo: https://github.com/sclorg/django-ex.git
from:
kind: DockerImage
name: registry.redhat.io/ubi8/python-39:latest
referencePolicy:
type: Local
- name: 3.6-ubi8
annotations:
openshift.io/display-name: Python 3.6 (UBI 8)
Expand Down
24 changes: 12 additions & 12 deletions tests/test_python_imagestreams.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ class TestHelmRHELPythonImageStreams:


@pytest.mark.parametrize(
"version,registry",
"version,registry,expected",
[
("3.12-minimal-ubi10", "registry.redhat.io/ubi10/python-312-minimal:latest"),
("3.12-minimal-ubi9", "registry.redhat.io/ubi9/python-312-minimal:latest"),
("3.12-ubi9", "registry.redhat.io/ubi9/python-312:latest"),
("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest"),
("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest"),
("3.11-ubi8", "registry.redhat.io/ubi8/python-311:latest"),
("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest"),
("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest"),
("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest"),
("3.12-minimal-ubi10", "registry.redhat.io/ubi10/python-312-minimal:latest", True),
("3.12-minimal-ubi9", "registry.redhat.io/ubi9/python-312-minimal:latest", True),
("3.12-ubi9", "registry.redhat.io/ubi9/python-312:latest", True),
("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest", True),
("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest", True),
("3.11-ubi8", "registry.redhat.io/ubi8/python-311:latest", True),
("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest", True),
("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest", False),
("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest", True),
],
)
def test_package_imagestream(self, helm_api, version, registry):
def test_package_imagestream(self, helm_api, version, registry, expected):
assert helm_api.helm_package()
assert helm_api.helm_installation()
assert helm_api.check_imagestreams(version=version, registry=registry)
assert helm_api.check_imagestreams(version=version, registry=registry) == expected