Merge pull request #478 from mloviska/no_auto_investigation2

Allow NO_INVESTIGATION=0

Author: mergify[bot]

openqa-investigate

@@ -379,7 +379,7 @@ investigate() {
     group="$(echo "$job_data" | runjq -r '.job.parent_group + " / " + .job.group')" || return $?
     [[ "$group" = " / " ]] && [[ "$exclude_no_group" = "true" ]] && echo "Job w/o job group, \$exclude_no_group is set, skipping investigation" && return 0
     [[ "$group" =~ $exclude_group_regex ]] && echo "Job group '$group' matches \$exclude_group_regex '$exclude_group_regex', skipping investigation" && return 0
-    user_unset="$(echo "$job_data" | runjq -r '.job.settings.NO_INVESTIGATION')" && [[ ! "$user_unset" =~ "null" ]] && echo "NO_INVESTIGATION=1 detected, skipping" && return 0
+    user_unset="$(echo "$job_data" | runjq -r '.job.settings.NO_INVESTIGATION')" && [[ ! "$user_unset" =~ "null" ]] && [[ $user_unset -eq 1 ]] && echo "NO_INVESTIGATION=1 detected, skipping" && return 0
 
     # Optionally we can find "first failed", could extend openQA investigation
     # method instead for we are just working based on supplied job which can

test/02-investigate.t

@@ -3,7 +3,7 @@
 source test/init
 bpan:source bashplus +err +fs +sym
 
-plan tests 100
+plan tests 102
 
 host=localhost
 url=https://localhost
@@ -93,6 +93,9 @@ client-get-job() {
         10042)
             echo '{"job": { "test": "vim", "result": "failed", "group": "42", "settings": {"NO_INVESTIGATION": "1"} } }'
             ;;
+        10043)
+            echo '{"job": { "test": "vim", "result": "failed", "group": "43", "settings": {"NO_INVESTIGATION": "0"} } }'
+            ;;
         404)
             echo '404 Not Found'
             ;;
@@ -144,6 +147,9 @@ client-get-job-comments() {
         10035)
             echo '[{"id": 1236, "text":"Starting investigation for job 10035"}]'
             ;;
+        10043)
+            echo '[{"id": 10043, "text":"Starting investigation for job 10043"}]'
+            ;;
         3000)
             echo '[{"id": 1236, "text":"Automatic investigation jobs for job\n*a:investigate:retry*: t#30001\n*a:investigate:last_good_tests:coffee*: t#30002\n*a:investigate:last_good_build:2001*: t#30003\n*a:investigate:last_good_tests_and_build:coffee+2001*: t#30004"}]'
             ;;
@@ -174,6 +180,9 @@ client-post-job-comment() {
         10035)
             echo '{"id": 1236}'
             ;;
+        10043)
+            echo '{"id": 10043}'
+            ;;
         3000)
             warn "Commenting 3000 ($@)"
             exit 99
@@ -231,6 +240,9 @@ get-dependencies-ajax() {
         10042)
             echo '{"cluster":{}, "edges":[], "nodes":[{"id":10042,"state":"done","result":"failed"}]}'
             ;;
+        10043)
+            echo '{"cluster":{}, "edges":[], "nodes":[{"id":10043,"state":"done","result":"failed"}]}'
+            ;;
         *)
             echo '{"debug": "get-dependencies-ajax '"$tid"'"}'
             ;;
@@ -316,6 +328,10 @@ try investigate 10042
 is "$rc" 0 'NO_INVESTIGATION=1, a failed job with this variable should be skipped'
 has "$got" 'NO_INVESTIGATION=1 detected, skipping'
 
+try investigate 10043
+is "$rc" 0 "Successful clone, NO_INVESTIGATION != 1 should not change default behavior"
+has "$got" '_TRIGGER_JOB_DONE_HOOK=1' "job is cloned with _TRIGGER_JOB_DONE_HOOK"
+
 test-post-investigate() {
     # job is one of the other investigation types, e.g. :investigate:last_good_tests
     try investigate 3001