precommit-ssh-apply.sh: Generate email files

... when patch series failed to apply.

Change-Id: I38349b1f003e78dde8cefecac57bd3086f63dac8

2 files changed, 26 insertions, 3 deletions

diff --git a/precommit-ssh-apply.sh b/precommit-ssh-apply.sh
index ffa32d87..4cfb4c00 100755
--- a/precommit-ssh-apply.sh
+++ b/precommit-ssh-apply.sh
@@ -99,12 +99,35 @@ fi
 patches_applied=$(git -C "$project" rev-list --count HEAD "^$prev_head")
 
 if [ "$patches_applied" -le "$num_patch" ]; then
+    apply_result="fail"
+    if [ "$res" = "0" ] && [ "$patches_applied" = "0" ]; then
+	# "series apply" finished successfully, but no patch was applied;
+	# this means that the patch is already merged.
+	apply_result="merged"
+    fi
+
+    cat > "$pw_dir/mail-recipients.txt" <<EOF
+$patch_submitter
+EOF
+    cat > "$pw_dir/mail-subject.txt" <<EOF
+[Linaro-TCWG-CI] $pw_url failed to apply
+EOF
+    cat > "$pw_dir/mail-body.txt" <<EOF
+${build_url}artifact/artifacts/jenkins/precommit-ssh-apply.log/*view*/
+
+Patch series $pw_url applied fewer patches than expected: $patches_applied vs expected $(($num_patch + 1))"
+EOF
+    if [ "$apply_result" = "merged" ]; then
+	cat >> "$pw_dir/mail-body.txt" <<EOF
+
+Most likely the patch series is now merged into mainline"
+EOF
+    fi
+
     if [ $res != 0 ]; then
 	exit $res
     fi
 
-    echo "WARNING: patch series applied fewer patches than expected"
-    echo "WARNING: applied $patches_applied vs expected $(($num_patch + 1))"
 
     exit 5
 fi
diff --git a/precommit-test.sh b/precommit-test.sh
index 67de5fb9..448c5e45 100755
--- a/precommit-test.sh
+++ b/precommit-test.sh
@@ -23,7 +23,7 @@ fi
 
 series_dir=$(mktemp -d)
 $scripts/precommit-ssh-apply.sh --pw_url "$pw_url" --fetch_only true \
-				--series_dir "$series_dir"
+				--series_dir "$series_dir" --verbose "$verbose"
 if ! [ "$num_patches" -gt "0" ]; then
     num_patches=$(find "$series_dir" -type f | wc -l)
 fi