commit 3ea9114e0de905f7d824a861fbbed23366a636b3
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Feb 26 11:18:33 2025 +0100
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Mon Mar 10 14:40:31 2025 +0100
tree 7a6a3567ed697ad9cf44aa27de5cf3080862b87c
parent 0d27ceb689635c484a88ba63dbc28506bf16db16

Update gitops01 to deploy 2 jenkins KSUs in same namespace and remove testapp OKA and KSU

Change-Id: I869e4bed0bd0a1e687afb13284f3cf3b6877c1e6
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

robot-systest/lib/advanced_cluster_mgmt_lib.resource

diff --git a/robot-systest/lib/advanced_cluster_mgmt_lib.resource b/robot-systest/lib/advanced_cluster_mgmt_lib.resource
index de9bb5d..dc1621d 100644
--- a/robot-systest/lib/advanced_cluster_mgmt_lib.resource
+++ b/robot-systest/lib/advanced_cluster_mgmt_lib.resource
@@ -29,9 +29,9 @@
 ${CLUSTER_DELETE_POL_TIME}   30sec
 ${OKA_OPERATION_MAX_WAIT_TIME}   5min
 ${OKA_OPERATION_POL_TIME}   15sec
-${KSU_CREATION_MAX_WAIT_TIME}   10min
+${KSU_CREATION_MAX_WAIT_TIME}   7min
 ${KSU_CREATION_POL_TIME}   30sec
-${KSU_DELETION_MAX_WAIT_TIME}   7min
+${KSU_DELETION_MAX_WAIT_TIME}   5min
 ${KSU_DELETION_POL_TIME}   15sec
 
 
@@ -187,9 +187,14 @@
 
 Create KSU
     [Documentation]   Create a KSU
-    [Arguments]   ${ksu_name}   ${ksu_description}   ${profile}   ${profile_type}   ${oka_name}   ${ksu_params_file}   ${wait_flag}=True
-    ${rc}   ${stdout}=   Run And Return Rc And Output
-    ...   osm ksu-create --ksu ${ksu_name} --description ${ksu_description} --profile ${profile} --profile-type ${profile_type} --oka ${oka_name} --params ${ksu_params_file}
+    [Arguments]   ${ksu_name}   ${ksu_description}   ${profile}   ${profile_type}   ${oka_name}   ${ksu_params_file}=${EMPTY}   ${wait_flag}=True
+    IF   "${ksu_params_file}" != "${EMPTY}"
+        ${rc}   ${stdout}=   Run And Return Rc And Output
+        ...   osm ksu-create --ksu ${ksu_name} --description ${ksu_description} --profile ${profile} --profile-type ${profile_type} --oka ${oka_name} --params ${ksu_params_file}
+    ELSE
+        ${rc}   ${stdout}=   Run And Return Rc And Output
+        ...   osm ksu-create --ksu ${ksu_name} --description ${ksu_description} --profile ${profile} --profile-type ${profile_type} --oka ${oka_name}
+    END
     Log   ${rc},${stdout}
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}   msg=KSU creation failed: ${stdout}
     ${ksu_id}=   Set Variable   ${stdout}