From 139d23ee4cd9d56067e45e29e705476ea7980e8a Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Mon, 10 Jun 2024 11:55:56 +0200
Subject: [PATCH] Remove RHEL8/php-73 which is EOL

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 deploy-and-test.yml        | 1 -
 files/check_pod_running.sh | 2 +-
 tasks/openshift_deploy.yml | 2 +-
 tasks/openshift_test.yml   | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deploy-and-test.yml b/deploy-and-test.yml
index cfb8402..f4871b4 100644
--- a/deploy-and-test.yml
+++ b/deploy-and-test.yml
@@ -150,7 +150,6 @@
         - 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
diff --git a/files/check_pod_running.sh b/files/check_pod_running.sh
index 4eeb1c6..ad55a2c 100755
--- a/files/check_pod_running.sh
+++ b/files/check_pod_running.sh
@@ -24,6 +24,6 @@ for i in {1..10}; do
       exit 1
     fi
   done <<< "${POD_STATUS}"
-  sleep 10
+  sleep 30
 done
 exit 1
diff --git a/tasks/openshift_deploy.yml b/tasks/openshift_deploy.yml
index ac7aa74..067e146 100644
--- a/tasks/openshift_deploy.yml
+++ b/tasks/openshift_deploy.yml
@@ -36,7 +36,7 @@
     register: route_cmd
     until: route_cmd.rc == 0
     retries: 30
-    delay: 5
+    delay: 10
     when: (deploy_cmd.rc == 0) and (cluster_name.rc == 0)
 
   - debug: var=route_cmd
diff --git a/tasks/openshift_test.yml b/tasks/openshift_test.yml
index f587ebe..5f0de5f 100644
--- a/tasks/openshift_test.yml
+++ b/tasks/openshift_test.yml
@@ -4,11 +4,11 @@
 
   - name: Check if curl command is working
     script: "./files/check_oc_exec_output.sh 'curl {{ service_ip.stdout | trim }}:8080' '{{ cluster_name.stdout | trim }}' '{{ stuff.check_curl_output }}'"
-    retries: 5
+    retries: 10
     delay: 20
     register: curl_output
     ignore_errors: yes
-    until: curl_output.rc == 0
+    until: (curl_output.rc == 0) and ("Connection refused" not in curl_output["stderr"])
 #  - name: Check curl command is working
 #    uri:
 #      url: "http://{{ route_cmd.stdout }}"