re-added shallow resubmission test

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index a2bd8a4..04bbb5c 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -53,7 +53,10 @@ l_SRC = \
        failed_dag.l \
        failed_subjob.l \
        aborted.l \
-       cancelled.l 
+       cancelled.l \
+       shallow_resub_complex.l shallow_resub_simple.l shallow_resub_simple2.l \
+       resubmission.l resubmitted.l
+
 
 sh_PROGS = $(l_SRC:.l=.sh)
 

diff --git a/org.glite.lb.client/examples/resubmission.l b/org.glite.lb.client/examples/resubmission.l
new file mode 100644 (file)
index 0000000..3b8765c
--- /dev/null
+++ b/org.glite.lb.client/examples/resubmission.l
@@ -0,0 +1,18 @@
+# one resubmission cycle
+
+-s LogMonitor,-e EnQueued, --queue="wm_input.fl", --job="job description in receiver language", --result=OK, --reason="detailed description of transfer"
+
+-s WorkloadManager,-e DeQueued, --queue="wm_input.fl", --local_jobid="WM_ID" 
+-s WorkloadManager,-e HelperCall, --helper_name="name of the called component",--helper_params="parameters of the call", --src_role=CALLING
+-s WorkloadManager,-e Match,--dest_id="${DESTINATION:-destination CE/queue}"
+-s WorkloadManager,-e HelperReturn, --helper_name="name of the called component",--retval="returned data", --src_role=CALLING
+-s WorkloadManager,-e EnQueued, --queue="wm_output.fl", --job="job description in receiver language", --result=OK, --reason="detailed description of transfer"
+
+-s JobController,-e DeQueued, --queue="wm_output.fl", --local_jobid="JC_ID"
+-s JobController,-e Transfer,--destination="LRMS",--dest_host="destination hostname",--dest_instance="destination instance",--dest_jobid="job description in receiver language",--result=OK,--reason="detailed description of transfer",--dest_jobid="destination internal jobid"
+
+-s LogMonitor,-e Accepted, --from="JobController", --from_host="sending component hostname", --from_instance="sending component instance", --local_jobid="new jobId (Condor, Globus ...)"
+-s LogMonitor,-e Transfer,--destination="LRMS",--dest_host="destination hostname",--dest_instance="destination instance",--dest_jobid="job description in receiver language",--result=OK,--reason="detailed description of transfer",--dest_jobid="destination internal jobid"
+
+-s LogMonitor,-e Running,--node="${CE_NODE:-worker node}"
+

diff --git a/org.glite.lb.client/examples/resubmitted.l b/org.glite.lb.client/examples/resubmitted.l
new file mode 100644 (file)
index 0000000..0051f40
--- /dev/null
+++ b/org.glite.lb.client/examples/resubmitted.l
@@ -0,0 +1,20 @@
+# resubmitted job example
+
+! DESTINATION=CE1/queue1
+! CE_NODE=worker1
+:running:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
+
+! DESTINATION=CE3/queue3
+! CE_NODE=worker3
+:resubmission:
+

diff --git a/org.glite.lb.client/examples/shallow_and_full_resub.l b/org.glite.lb.client/examples/shallow_and_full_resub.l
new file mode 100644 (file)
index 0000000..7911d92
--- /dev/null
+++ b/org.glite.lb.client/examples/shallow_and_full_resub.l
@@ -0,0 +1,35 @@
+# shallow resubmission job example
+
+! DESTINATION=CE1/queue1
+! CE_NODE=worker1
+:running:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE3/queue3
+! CE_NODE=worker3
+:resubmission:
+
+-s LogMonitor, -e ReallyRunning, --wn_seq="$EDG_WL_SEQUENCE"
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+
+#       payload_running=false
+#       destination=CE2/queue2
+#       ce_node=worker2
+#       possible_destinations=CE2/queue2 
+#       possible_ce_nodes=worker2
+

diff --git a/org.glite.lb.client/examples/shallow_resub_complex.l b/org.glite.lb.client/examples/shallow_resub_complex.l
new file mode 100644 (file)
index 0000000..258274c
--- /dev/null
+++ b/org.glite.lb.client/examples/shallow_resub_complex.l
@@ -0,0 +1,42 @@
+# shallow resubmission job example
+
+! DESTINATION=CE1/queue1
+! CE_NODE=worker1
+:running:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+! BRANCH_SEQUENCE="$EDG_WL_SEQUENCE"
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE3/queue3
+! CE_NODE=worker3
+:resubmission:
+
+-s LogMonitor, -e ReallyRunning, --wn_seq="$BRANCH_SEQUENCE"
+
+#      payload_running=true
+#       destination=CE2/queue2
+#      ce_node=worker2
+#      possible_destinations=CE1/queue1 CE2/queue2 CE3/queue3
+#      possible_ce_nodes=worker1 worker2 worker3
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
+
+! DESTINATION=CE4/queue4
+! CE_NODE=worker4
+:resubmission:
+
+#       payload_running=false
+#       destination=CE4/queue4
+#       ce_node=worker4
+#       possible_destinations=CE4/queue4
+#       possible_ce_nodes=worker4
+

diff --git a/org.glite.lb.client/examples/shallow_resub_simple.l b/org.glite.lb.client/examples/shallow_resub_simple.l
new file mode 100644 (file)
index 0000000..18800a3
--- /dev/null
+++ b/org.glite.lb.client/examples/shallow_resub_simple.l
@@ -0,0 +1,28 @@
+# shallow resubmission job example
+
+! DESTINATION=CE1/queue1
+! CE_NODE=worker1
+:running:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE3/queue3
+! CE_NODE=worker3
+:resubmission:
+
+-s LogMonitor, -e ReallyRunning, --wn_seq="$EDG_WL_SEQUENCE"
+
+#       payload_running=true
+#       destination=CE3/queue3
+#       ce_node=worker3
+#       possible_destinations=CE1/queue1 CE2/queue2 CE3/queue3
+#       possible_ce_nodes=worker1 worker2 worker3
+

diff --git a/org.glite.lb.client/examples/shallow_resub_simple2.l b/org.glite.lb.client/examples/shallow_resub_simple2.l
new file mode 100644 (file)
index 0000000..384f444
--- /dev/null
+++ b/org.glite.lb.client/examples/shallow_resub_simple2.l
@@ -0,0 +1,29 @@
+# shallow resubmission job example
+
+! DESTINATION=CE1/queue1
+! CE_NODE=worker1
+:running:
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE2/queue2
+! CE_NODE=worker2
+:resubmission:
+! BRANCH_SEQUENCE="$EDG_WL_SEQUENCE"
+
+-s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
+-s LogMonitor, -e Resubmission, --result=SHALLOW, --reason="let's try again", --tag=none
+
+! DESTINATION=CE3/queue3
+! CE_NODE=worker3
+:resubmission:
+
+-s LogMonitor, -e ReallyRunning, --wn_seq="$BRANCH_SEQUENCE"
+
+#      payload_running=true
+#       destination=CE2/queue2
+#      ce_node=worker2
+#      possible_destinations=CE1/queue1 CE2/queue2 CE3/queue3
+#      possible_ce_nodes=worker1 worker2 worker3
+