From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 14 Jun 2017 02:59:54 +0000 (+0800)
Subject: Move gerrit comment logic to its own file
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=69591a53f460f0a174b274f643a44f9102d2d78a;p=releng.git

Move gerrit comment logic to its own file

this file will become too complicated to escape inside the job
definition.

Change-Id: I3e167bee5d315a7ff3b52e7274b68c3146dfbd03
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
---

diff --git a/jjb/ci_gate_security/anteater-report-to-gerrit.sh b/jjb/ci_gate_security/anteater-report-to-gerrit.sh
new file mode 100644
index 000000000..6a5a0a551
--- /dev/null
+++ b/jjb/ci_gate_security/anteater-report-to-gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+export PATH=$PATH:/usr/local/bin/
+
+# If no violations were found, no lint log will exist.
+if [[ -e securityaudit.log ]] ; then
+    echo -e "\nposting security audit report to gerrit...\n"
+
+    cat securityaudit.log  | awk -F"ERROR\ \-\ " '{print $2}' > shortlog
+
+    ssh -p 29418 gerrit.opnfv.org \
+        "gerrit review -p $GERRIT_PROJECT \
+         -m \"$(cat shortlog)\" \
+         $GERRIT_PATCHSET_REVISION \
+         --notify NONE"
+
+    exit 1
+fi
diff --git a/jjb/ci_gate_security/anteater-security-audit.sh b/jjb/ci_gate_security/anteater-security-audit.sh
index b11e68a61..ecc5c6fb0 100644
--- a/jjb/ci_gate_security/anteater-security-audit.sh
+++ b/jjb/ci_gate_security/anteater-security-audit.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-set -o pipefail
-
 cd $WORKSPACE
 echo "Generating patchset file to list changed files"
 git diff HEAD^1 --name-only | sed "s#^#/home/opnfv/anteater/$PROJECT/#" > $WORKSPACE/patchset
@@ -31,4 +29,3 @@ echo "--------------------------------------------------------"
 echo "Stopping docker container with ID $container_id"
 docker stop $container_id
 exit 0
-#exit $exit_code
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index c364186b2..2270124e7 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -83,24 +83,5 @@
 - builder:
     name: report-security-audit-result-to-gerrit
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
-            export PATH=$PATH:/usr/local/bin/
-
-            # If no violations were found, no lint log will exist.
-            if [[ -e securityaudit.log ]] ; then
-                echo -e "\nposting security audit report to gerrit...\n"
-
-                cat securityaudit.log
-                echo
-
-                ssh -p 29418 gerrit.opnfv.org \
-                    "gerrit review -p $GERRIT_PROJECT \
-                     -m \"$(cat securityaudit.log)\" \
-                     $GERRIT_PATCHSET_REVISION \
-                     --notify NONE"
-
-                exit 1
-            fi
+        - shell:
+            !include-raw: ./anteater-report-to-gerrit.sh