diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-06-14 11:13:25 +0800 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2017-06-14 11:13:25 +0800 |
| commit | e4e6211295ae7d1d18b481731fca188a1d1fd2af (patch) | |
| tree | 871b702fd24de9c1bb2659ce29979f58da7ded19 /jjb/ci_gate_security | |
| parent | 69591a53f460f0a174b274f643a44f9102d2d78a (diff) | |
Add exit status, remove awk warning
Change-Id: I090e601b45b58fae4235867536553570f2674f9a
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Diffstat (limited to 'jjb/ci_gate_security')
| -rw-r--r-- | jjb/ci_gate_security/anteater-report-to-gerrit.sh | 9 | ||||
| -rw-r--r-- | jjb/ci_gate_security/anteater-security-audit.sh | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/jjb/ci_gate_security/anteater-report-to-gerrit.sh b/jjb/ci_gate_security/anteater-report-to-gerrit.sh index 6a5a0a551..c0bf9fa5b 100644 --- a/jjb/ci_gate_security/anteater-report-to-gerrit.sh +++ b/jjb/ci_gate_security/anteater-report-to-gerrit.sh @@ -2,12 +2,17 @@ set -o errexit set -o pipefail export PATH=$PATH:/usr/local/bin/ +EXITSTATUS=0 # 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 +if grep ERROR securityaudit.log; then +EXITSTATUS=1 +fi + + cat securityaudit.log | awk -F"ERROR -\ " '{print $2}' > shortlog ssh -p 29418 gerrit.opnfv.org \ "gerrit review -p $GERRIT_PROJECT \ @@ -15,5 +20,5 @@ if [[ -e securityaudit.log ]] ; then $GERRIT_PATCHSET_REVISION \ --notify NONE" - exit 1 + exit $EXITSTATUS fi diff --git a/jjb/ci_gate_security/anteater-security-audit.sh b/jjb/ci_gate_security/anteater-security-audit.sh index ecc5c6fb0..d5c0e407c 100644 --- a/jjb/ci_gate_security/anteater-security-audit.sh +++ b/jjb/ci_gate_security/anteater-security-audit.sh @@ -28,4 +28,5 @@ exit_code=$? echo "--------------------------------------------------------" echo "Stopping docker container with ID $container_id" docker stop $container_id +cat securityaudit.log exit 0 |