Fix using rails-ex repo and rails-postgresql-persistent.json file

Missing image definitions

For first test let's use phracek fork

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

examples/rails-postgresql-persistent.json

@@ -176,7 +176,7 @@
             "initContainers": [
               {
                 "name": "ruby-init-container",
-                "image": " ",
+                "image": "${NAME}:latest",
                 "command": [
                   "./migrate-database.sh"
                 ],
@@ -256,7 +256,7 @@
             "containers": [
               {
                 "name": "${NAME}",
-                "image": " ",
+                "image": "${NAME}:latest",
                 "ports": [
                   {
                     "containerPort": 8080

examples/rails.json

@@ -155,8 +155,8 @@
           "spec": {
             "containers": [
               {
-                "name": "rails-example",
-                "image": " ",
+                "name": "${NAME}",
+                "image": "${NAME}:latest",
                 "ports": [
                   {
                     "containerPort": 8080

test/conftest.py

@@ -56,9 +56,9 @@
 if VERSION:
     v = float(VERSION)
     if v >= 4.0:
-        TEST_APP_BRANCH = "4.0"
+        TEST_APP_BRANCH = "fix_templates_rails_40" # "4.0"
     elif v >= 3.3:
-        TEST_APP_BRANCH = "3.3"
+        TEST_APP_BRANCH = "fix_templates_rails_33" # "3.3"
 DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-12-c8s"
 VARS = Vars(
     OS=OS,

test/test_ocp_s2i_templates.py

@@ -27,27 +27,26 @@ def teardown_method(self):
         self.oc_api.delete_project()
 
     @pytest.mark.parametrize(
-        "template_type",
+        "template_type, template_name",
         [
-            "local",
-            "ex",
+            ("local", "rails.json"),
+            ("local", "rails-postgresql-persistent.json"),
+            ("ex", "rails.json"),
+            ("ex", "rails-postgresql.json"),
         ],
     )
-    def test_rails_template_inside_cluster(self, template_type):
+    def test_rails_template_cluster(self, template_type, template_name):
         """
         Test if Ruby s2i local templates work properly
         """
-        assert self.oc_api.upload_image(
-            VARS.DEPLOYED_PSQL_IMAGE, VARS.PSQL_IMAGE_SHORT
-        )
+        assert self.oc_api.upload_image(VARS.DEPLOYED_PSQL_IMAGE, VARS.PSQL_IMAGE_SHORT)
         service_name = f"ruby-{VARS.SHORT_VERSION}-testing"
-        if template_type == "local":
-            template_url = "examples/rails.json"
-        else:
+        template_url = f"examples/{template_name}"
+        if template_type == "ex":
             template_url = self.oc_api.get_raw_url_for_json(
-                container="rails-ex",
+                container="phracek",
                 dir="openshift/templates",
-                filename="rails.json",
+                filename=template_name,
                 branch=VARS.TEST_APP_BRANCH,
             )
         openshift_args = [
@@ -56,17 +55,14 @@ def test_rails_template_inside_cluster(self, template_type):
             f"RUBY_VERSION={VARS.VERSION}",
             f"NAME={service_name}",
         ]
-        # TODO: Add postgresql persistent template
-        # if template != "rails.json":
-        #     openshift_args = [
-        #         "SOURCE_REPOSITORY_URL=https://github.com/sclorg/rails-ex.git",
-        #         f"SOURCE_REPOSITORY_REF={VARS.TEST_APP_BRANCH}",
-        #         f"POSTGRESQL_VERSION={VARS.PSQL_IMAGE_TAG}",
-        #         f"RUBY_VERSION={VARS.VERSION}",
-        #         f"NAME={service_name}",
-        #         "DATABASE_USER=testu",
-        #         "DATABASE_PASSWORD=testp",
-        #     ]
+        if template_name != "rails.json":
+            openshift_args.extend(
+                [
+                    f"POSTGRESQL_VERSION={VARS.PSQL_IMAGE_TAG}",
+                    "DATABASE_USER=testu",
+                    "DATABASE_PASSWORD=testp",
+                ]
+            )
         assert self.oc_api.deploy_template_with_image(
             image_name=VARS.IMAGE_NAME,
             template=template_url,