From 1461edd897e1ef723cfb4de6d5758c38a924ae7b Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 31 Oct 2025 10:08:21 +0100 Subject: [PATCH] Fix by pre-commit hook conftest.py Fix deploying template with proper version Signed-off-by: Petr "Stone" Hracek --- imagestreams/php-centos.json | 4 ++-- imagestreams/php-rhel-aarch64.json | 4 ++-- imagestreams/php-rhel.json | 4 ++-- test/conftest.py | 3 +-- test/test_ocp_php_deploy_templates.py | 3 ++- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/imagestreams/php-centos.json b/imagestreams/php-centos.json index c91dd1f90..7552e7164 100644 --- a/imagestreams/php-centos.json +++ b/imagestreams/php-centos.json @@ -128,7 +128,7 @@ "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", @@ -136,7 +136,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi9" + "name": "8.3-ubi10" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/php-rhel-aarch64.json b/imagestreams/php-rhel-aarch64.json index c52079d6a..2565b7034 100644 --- a/imagestreams/php-rhel-aarch64.json +++ b/imagestreams/php-rhel-aarch64.json @@ -128,7 +128,7 @@ "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", @@ -136,7 +136,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi9" + "name": "8.3-ubi10" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/php-rhel.json b/imagestreams/php-rhel.json index c52079d6a..2565b7034 100644 --- a/imagestreams/php-rhel.json +++ b/imagestreams/php-rhel.json @@ -128,7 +128,7 @@ "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", @@ -136,7 +136,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "8.3-ubi9" + "name": "8.3-ubi10" }, "referencePolicy": { "type": "Local" diff --git a/test/conftest.py b/test/conftest.py index 683c3c28e..c2473584c 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -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" ] ) @@ -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, diff --git a/test/test_ocp_php_deploy_templates.py b/test/test_ocp_php_deploy_templates.py index 6e1c25991..78f27d475 100644 --- a/test/test_ocp_php_deploy_templates.py +++ b/test/test_ocp_php_deploy_templates.py @@ -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(