Use packaging for version comparisons

And test newer Django-ex for newer Pythons in OS.

Fixes: #730

Author: frenzymadness

test/test_deploy_templates.py

@@ -2,6 +2,7 @@
 import sys
 
 import pytest
+from packaging.version import Version
 
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
@@ -21,7 +22,8 @@
 IMAGE_TAG = "postgresql:10"
 PSQL_VERSION = "10"
 
-if VERSION == "3.11" or VERSION == "3.12":
+if Version(VERSION) >= Version("3.11"):
+    BRANCH_TO_TEST = "4.2.x"
     DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-12-c8s"
     IMAGE_TAG = "postgresql:12"
     PSQL_VERSION = "12"

test/test_imagestreams_quickstart.py

@@ -2,6 +2,7 @@
 import sys
 
 import pytest
+from packaging.version import Version
 
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
@@ -21,7 +22,7 @@
 IMAGE_TAG = "postgresql:10"
 PSQL_VERSION = "10"
 
-if VERSION == "3.11" or VERSION == "3.12":
+if Version(VERSION) >= Version("3.11"):
     BRANCH_TO_TEST = "4.2.x"
     DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-12-c8s"
     IMAGE_TAG = "postgresql:12"

test/test_python_ex_template.py

@@ -2,6 +2,7 @@
 import sys
 
 import pytest
+from packaging.version import Version
 
 from container_ci_suite.utils import check_variables
 from container_ci_suite.openshift import OpenShiftAPI
@@ -15,7 +16,10 @@
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 
-BRANCH_TO_TEST = "2.2.x"
+if Version(VERSION) >= Version("3.11"):
+    BRANCH_TO_TEST = "4.2.x"
+else:
+    BRANCH_TO_TEST = "2.2.x"
 
 
 # Replacement with 'test_python_s2i_app_ex'