Use VERSION instead of SINGLE_VERSION like we do in all test in org s…

…clorg Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Jul 22, 2024 · 5d94af4 · 5d94af4
1 parent 2470c5e
commit 5d94af4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/examples/rails-postgresql-persistent.json b/examples/rails-postgresql-persistent.json
@@ -141,10 +141,7 @@
               "secret": "${GITHUB_WEBHOOK_SECRET}"
             }
           }
-        ],
-        "postCommit": {
-          "script": "bundle exec rake test"
-        }
+        ]
       }
     },
     {

diff --git a/test/test_ruby_ex_standalone.py b/test/test_ruby_ex_standalone.py
@@ -7,11 +7,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_ruby_latest_imagestreams.py b/test/test_ruby_latest_imagestreams.py
@@ -9,10 +9,10 @@
 TEST_DIR = Path(os.path.abspath(os.path.dirname(__file__)))
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 
 
 # Replacement with 'test_latest_imagestreams'

diff --git a/test/test_s2i_imagestreams.py b/test/test_s2i_imagestreams.py
@@ -6,11 +6,11 @@
 
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("OS")
 

diff --git a/test/test_s2i_integration.py b/test/test_s2i_integration.py
@@ -5,11 +5,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_s2i_local_templates.py b/test/test_s2i_local_templates.py
@@ -7,11 +7,11 @@
 from container_ci_suite.utils import check_variables
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 

diff --git a/test/test_s2i_rails_ex_templates.py b/test/test_s2i_rails_ex_templates.py
@@ -7,11 +7,11 @@
 from container_ci_suite.utils import check_variables
 
 if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
+    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 
-VERSION = os.getenv("SINGLE_VERSION")
+VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,10 +141,7 @@ @@
                   "secret": "${GITHUB_WEBHOOK_SECRET}"
                 }
               }
-            ],
-            "postCommit": {
-              "script": "bundle exec rake test"
-            }
+            ]
           }
         },
         {
@@ Expand Down @@