From 4d01b36da81afe3c380349effa4b51e68526e29d Mon Sep 17 00:00:00 2001 From: Dario Mapelli Date: Mon, 4 Dec 2023 15:23:38 +0100 Subject: [PATCH 1/2] jenkins tests - crab client validation for recover --- .../testingScripts/clientValidation.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/container/testingScripts/clientValidation.sh b/test/container/testingScripts/clientValidation.sh index 940375458c..4668149b7b 100755 --- a/test/container/testingScripts/clientValidation.sh +++ b/test/container/testingScripts/clientValidation.sh @@ -12,7 +12,7 @@ source setupCRABClient.sh TASK_DIR="${WORK_DIR}/CRABServer/test/clientValidationTasks" #list of commands to execute for full testing (sl7/8) - FULL_TEST=(createmyproxy checkusername checkwrite tasks preparelocal status report getlog getoutput) + FULL_TEST=(createmyproxy checkusername checkwrite tasks preparelocal status report getlog getoutput recover) #list of commands to execute on sl6 SL6_TESTS=(status checkusername) @@ -245,5 +245,20 @@ source setupCRABClient.sh checkThisCommand kill "$param" done + ### 11. test crab recover --proxy=PROXY --dir=PROJDIR + USETHISPARMS=() + INITPARMS="--proxy --dir" + feedParms "$PROXY $PROJDIR" + for param in "${USETHISPARMS[@]}"; do + checkThisCommand recover "$param" + done + + ### 12. test crab recover --proxy=PROXY --task=TASKNAME --instance=INSTANCE + USETHISPARMS=() + INITPARMS="--proxy --task --instance" + feedParms "$PROXY $TASKTOTRACK $REST_Instance" + for param in "${USETHISPARMS[@]}"; do + checkThisCommand recover "$param" + done } 2>&1 | tee ${WORK_DIR}/client-validation.log From 3a63e6bd217c00a0228baadb459351e1af886425 Mon Sep 17 00:00:00 2001 From: Dario Mapelli Date: Mon, 4 Dec 2023 15:33:10 +0100 Subject: [PATCH 2/2] jenkins tests - crab client validation for status --task/--instance --- test/container/testingScripts/clientValidation.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/container/testingScripts/clientValidation.sh b/test/container/testingScripts/clientValidation.sh index 4668149b7b..d5866844d8 100755 --- a/test/container/testingScripts/clientValidation.sh +++ b/test/container/testingScripts/clientValidation.sh @@ -194,9 +194,15 @@ source setupCRABClient.sh done for param in "${USETHISPARMS[@]}"; do checkThisCommand status "$param" - done + ### 6b. test crab status --proxy=PROXY --task=TASKNAME --instance=INSTANCE + USETHISPARMS=() + INITPARMS="--proxy --task --instance" + feedParms "$PROXY $TASKTOTRACK $REST_Instance" + for param in "${USETHISPARMS[@]}"; do + checkThisCommand status "$param" + done ### 7. test crab report --proxy=PROXY --dir=PROJDIR --outputdir=OUTPUTDIR USETHISPARMS=()