From 7543500fcd5ebf129f3df0aeb5a9d809d5ab4dfe Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Thu, 22 Feb 2024 08:37:54 +0100
Subject: [PATCH] Separate container to NoS2I and S2I tests

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 .github/workflows/interop-tests.yml |  6 ++-
 deploy-and-test.yml                 | 73 +++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml
index e13b291..d828809 100644
--- a/.github/workflows/interop-tests.yml
+++ b/.github/workflows/interop-tests.yml
@@ -13,8 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - context: "RHSCL InterOp tests"
-            test_name: "ocp4-tests"
+          - context: "RHSCL InterOp NonS2I tests"
+            test_name: "ocp4-tests EXT_TEST=nos2i"
+          - context: "RHSCL InterOp S2I tests"
+            test_name: "ocp4-tests EXT_TEST=s2i"
           - context: "Java InterOp Tests"
             test_name: "ocp4-tests EXT_TEST=java"
           - context: "DotNet InterOp Tests"
diff --git a/deploy-and-test.yml b/deploy-and-test.yml
index 285338a..0629291 100644
--- a/deploy-and-test.yml
+++ b/deploy-and-test.yml
@@ -109,6 +109,79 @@
         - rhel9-s2i-ruby-31-container
       when: (github_repo == "") and (ext_test == "")
 
+    - name: Check None-s2i containers
+      include_tasks: ./tasks/verify_in_openshift.yml
+      loop:
+        - rhel7-nginx-ex-120
+        - rhel7-postgresql-10-container
+        - rhel7-mysql-80-container
+        - rhel7-mariadb-103-container
+        - rhel7-mariadb-105-container
+        - rhel8-httpd-ex
+        - rhel8-mariadb-105-container
+        - rhel8-mariadb-1011-container
+        - rhel8-postgresql-10-container
+        - rhel8-postgresql-12-container
+        - rhel8-postgresql-13-container
+        - rhel8-postgresql-15-container
+        - rhel8-postgresql-16-container
+        - rhel8-mysql-80-container
+        - rhel8-nginx-ex-122
+        - rhel8-nginx-ex-124
+        - rhel9-httpd-ex
+        - rhel9-mariadb-105-container
+        - rhel9-mariadb-1011-container
+        - rhel9-mysql-80-container
+        - rhel9-nginx-ex-122
+        - rhel9-nginx-ex-124
+        - rhel9-postgresql-13-container
+        - rhel9-postgresql-15-container
+        - rhel9-postgresql-16-container
+      when: (github_repo == "") and (ext_test is defined) and (ext_test == "nos2i")
+
+    - name: Check s2i containers
+      include_tasks: ./tasks/verify_in_openshift.yml
+      loop:
+        - rhel7-nodejs-ex-14
+        - rhel7-s2i-perl-530-container
+        - rhel7-s2i-ruby-30-container
+        - rhel7-s2i-python-38-container
+        - rhel8-nodejs-ex-16
+        - rhel8-nodejs-ex-18
+        - rhel8-nodejs-ex-18-minimal
+        - rhel8-nodejs-ex-20
+        - rhel8-nodejs-ex-20-minimal
+        - rhel8-cakephp-ex-73
+        - rhel8-cakephp-ex-74
+        #- rhel8-cakephp-ex-80 It looks like no prepared for PHP-8.0
+        #- rhel8-cakephp-ex-81 It looks like no prepared for PHP-8.0
+        - rhel8-django-ex-python-36
+        - rhel8-django-ex-python-38
+        - rhel8-s2i-perl-532-container
+        - rhel8-s2i-perl-526-container
+        - rhel8-s2i-python-36-container
+        - rhel8-s2i-python-39-container
+        - rhel8-s2i-python-311-container
+        - rhel8-s2i-python-312-container
+        - rhel8-s2i-ruby-25-container
+        - rhel8-s2i-ruby-27-container
+        - rhel8-s2i-ruby-30-container
+        - rhel8-s2i-ruby-31-container
+        - rhel8-s2i-ruby-33-container
+        - rhel9-nodejs-ex-16
+        - rhel9-nodejs-ex-18
+        - rhel9-nodejs-ex-18-minimal
+        - rhel9-nodejs-ex-20
+        - rhel9-nodejs-ex-20-minimal
+        - rhel9-s2i-perl-532-container
+        - rhel9-s2i-python-39-container
+        - rhel9-s2i-python-311-container
+        - rhel9-s2i-python-312-container
+        - rhel9-s2i-ruby-30-container
+        - rhel9-s2i-ruby-31-container
+        - rhel9-s2i-ruby-33-container
+      when: (github_repo == "") and (ext_test is defined) and (ext_test == "s2i")
+
     - name: Clone and test only one upstream container repository
       include_tasks: ./tasks/verify_in_openshift.yml
       loop: