From efbf50991e6f9925b44c089da216d5e96c3b528d Mon Sep 17 00:00:00 2001
From: Marcial Rosales <marcial.rosales@broadcom.com>
Date: Thu, 28 Nov 2024 12:14:18 +0100
Subject: [PATCH] Deploy rabbitmq first when using proxies

---
 selenium/bin/suite_template                                 | 6 +++---
 selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh       | 2 +-
 .../oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh    | 2 +-
 .../authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/selenium/bin/suite_template b/selenium/bin/suite_template
index c99e290204d7..4b8427994dfe 100644
--- a/selenium/bin/suite_template
+++ b/selenium/bin/suite_template
@@ -513,13 +513,13 @@ elif [[ "$COMMAND" == "stop-rabbitmq" ]]
   fi
 }
 determine_required_components_including_rabbitmq() {
-  if [[ "$@" != *"rabbitmq"* ]]; then
-    REQUIRED_COMPONENTS+=("rabbitmq")
-  fi
   for (( i=1; i<=$#; i++)) {
     eval val='$'$i
     REQUIRED_COMPONENTS+=( "$val" )
   }
+  if [[ "$@" != *"rabbitmq"* ]]; then
+    REQUIRED_COMPONENTS+=("rabbitmq")
+  fi
 }
 determine_required_components_excluding_rabbitmq() {
   for (( i=1; i<=$#; i++)) {
diff --git a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
index 17c83430ebc9..5fc83d8d9818 100755
--- a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
+++ b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
@@ -6,4 +6,4 @@ TEST_CASES_PATH=/basic-auth
 PROFILES="proxy"
 
 source $SCRIPT/../../bin/suite_template
-runWith proxy
+runWith rabbitmq proxy
diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
index efbc223badc1..1217a386a998 100755
--- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
+++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
@@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth
 PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated mgt-prefix uaa-oauth-provider"
 
 source $SCRIPT/../../bin/suite_template $@
-runWith uaa fakeportal fakeproxy
+runWith rabbitmq uaa fakeportal fakeproxy
diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
index 1de40086af1d..fc348fb5e189 100755
--- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
+++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
@@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth
 PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated uaa-oauth-provider"
 
 source $SCRIPT/../../bin/suite_template $@
-runWith uaa fakeportal fakeproxy
+runWith rabbitmq uaa fakeportal fakeproxy