Skip to content

Fix by pre-commit hook conftest.py #505

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 1 commit into from
Oct 31, 2025
Merged

Fix by pre-commit hook conftest.py #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 imagestreams/php-centos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@
"annotations": {
"openshift.io/display-name": "PHP 8.3 (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Build and run PHP 8.3 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"iconClass": "icon-php",
"tags": "builder,php",
"version": "8.3",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
},
"from": {
"kind": "ImageStreamTag",
"name": "8.3-ubi9"
"name": "8.3-ubi10"
},
"referencePolicy": {
"type": "Local"
Expand Down
4 changes: 2 additions & 2 deletions imagestreams/php-rhel-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@
"annotations": {
"openshift.io/display-name": "PHP 8.3 (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Build and run PHP 8.3 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"iconClass": "icon-php",
"tags": "builder,php",
"version": "8.3",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
},
"from": {
"kind": "ImageStreamTag",
"name": "8.3-ubi9"
"name": "8.3-ubi10"
},
"referencePolicy": {
"type": "Local"
Expand Down
4 changes: 2 additions & 2 deletions imagestreams/php-rhel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@
"annotations": {
"openshift.io/display-name": "PHP 8.3 (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Build and run PHP 8.3 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"description": "Build and run PHP 8.3 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"iconClass": "icon-php",
"tags": "builder,php",
"version": "8.3",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git"
},
"from": {
"kind": "ImageStreamTag",
"name": "8.3-ubi9"
"name": "8.3-ubi10"
},
"referencePolicy": {
"type": "Local"
Expand Down
3 changes: 1 addition & 2 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

Vars = namedtuple(
"Vars", [
"OS", "TAG", "VERSION", "IMAGE_NAME", "IS_MINIMAL",
"OS", "TAG", "VERSION", "IMAGE_NAME",
"SHORT_VERSION", "TEST_DIR", "BRANCH_TO_TEST", "CHECK_MSG"
]
)
Expand All @@ -34,7 +34,6 @@
TAG=TAGS.get(OS),
VERSION=VERSION,
IMAGE_NAME=os.getenv("IMAGE_NAME"),
IS_MINIMAL="minimal" in VERSION,
SHORT_VERSION=VERSION.replace(".", ""),
TEST_DIR=Path(__file__).parent.absolute(),
BRANCH_TO_TEST=BRANCH_TO_TEST,
Expand Down
3 changes: 2 additions & 1 deletion test/test_ocp_php_deploy_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ def test_php_template_inside_cluster(self):
)
openshift_args = [
f"SOURCE_REPOSITORY_REF={VARS.BRANCH_TO_TEST}",
f"PHP_VERSION={VARS.SHORT_VERSION}{VARS.TAG}",
"SOURCE_REPOSITORY_URL=https://github.com/sclorg/cakephp-ex.git",
f"PHP_VERSION={VARS.VERSION}{VARS.TAG}",
f"NAME={service_name}"
]
assert self.oc_api.deploy_template_with_image(
Expand Down