@@ -58,7 +58,6 @@ if [ "${1:-}" = '--only-integration-tests' ]; then
58
58
RUN_ONLY_INTEGRATION_TESTS=yes
59
59
fi
60
60
61
- SPOTBUGS_STATUS=
62
61
VERIFY_STATUS=
63
62
ANSIBLE_LINT_STATUS=
64
63
@@ -67,7 +66,6 @@ if [ "${SPRING_PROFILES_ACTIVE:-}" = 'travis' ] && [ "${TRAVIS_PULL_REQUEST:-fal
67
66
DANGER_STATUS=
68
67
fi
69
68
70
- SPOTBUGS_TIME=0
71
69
VERIFY_TIME=0
72
70
ANSIBLE_LINT_TIME=0
73
71
DANGER_TIME=0
@@ -90,18 +88,9 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
90
88
MODIFIED_FILES=" $( git --no-pager diff --name-only " $TRAVIS_COMMIT_RANGE " -- 2> /dev/null || :) "
91
89
92
90
if [ -n " $MODIFIED_FILES " ]; then
93
- AFFECTS_POM_XML=" $( echo " $MODIFIED_FILES " | grep -Fxq ' pom.xml' || echo ' no' ) "
94
91
AFFECTS_TRAVIS_CFG=" $( echo " $MODIFIED_FILES " | grep -Fxq ' .travis.yml' || echo ' no' ) "
95
- AFFECTS_SPOTBUGS_CFG=" $( echo " $MODIFIED_FILES " | grep -q ' spotbugs-filter\.xml$' || echo ' no' ) "
96
- AFFECTS_JAVA_FILES=" $( echo " $MODIFIED_FILES " | grep -q ' \.java$' || echo ' no' ) "
97
92
AFFECTS_PLAYBOOKS=" $( echo " $MODIFIED_FILES " | grep -Eq ' (vagrant|prod|deploy|bootstrap|/roles/.+)\.yml$' || echo ' no' ) "
98
93
99
- if [ " $AFFECTS_POM_XML " = ' no' ]; then
100
- if [ " $AFFECTS_JAVA_FILES " = ' no' ]; then
101
- [ " $AFFECTS_SPOTBUGS_CFG " != ' no' ] || SPOTBUGS_STATUS=skip
102
- fi
103
- fi
104
-
105
94
if [ " $AFFECTS_TRAVIS_CFG " = ' no' ]; then
106
95
if [ " $AFFECTS_PLAYBOOKS " = ' no' ]; then
107
96
ANSIBLE_LINT_STATUS=skip
@@ -120,14 +109,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
120
109
121
110
echo
122
111
123
- if [ " $SPOTBUGS_STATUS " != ' skip' ]; then
124
- START_TIME=$SECONDS
125
- # run after tests for getting compiled sources
126
- " $EXEC_CMD " spotbugs > spotbugs.log 2>&1 || SPOTBUGS_STATUS=fail
127
- SPOTBUGS_TIME=$(( SECONDS - START_TIME))
128
- fi
129
- print_status " $SPOTBUGS_STATUS " " $SPOTBUGS_TIME " ' Run SpotBugs'
130
-
131
112
if [ " $ANSIBLE_LINT_STATUS " != ' skip' ]; then
132
113
START_TIME=$SECONDS
133
114
" $EXEC_CMD " ansible-lint > ansible_lint.log 2>&1 || ANSIBLE_LINT_STATUS=fail
151
132
print_status " $DANGER_STATUS " " $DANGER_TIME " ' Run danger'
152
133
153
134
if [ " $RUN_ONLY_INTEGRATION_TESTS " = ' no' ]; then
154
- [ " $SPOTBUGS_STATUS " = ' skip' ] || print_log spotbugs.log ' Run SpotBugs'
155
135
[ " $ANSIBLE_LINT_STATUS " = ' skip' ] || print_log ansible_lint.log ' Run Ansible Lint'
156
136
fi
157
137
@@ -161,8 +141,8 @@ if [ "$DANGER_STATUS" != 'skip' ]; then
161
141
print_log danger.log ' Run danger'
162
142
fi
163
143
164
- rm -f spotbugs.log verify.log danger.log ansible_lint.log
144
+ rm -f verify.log danger.log ansible_lint.log
165
145
166
- if echo " $SPOTBUGS_STATUS$ VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS " | grep -Fqs ' fail' ; then
146
+ if echo " $VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS " | grep -Fqs ' fail' ; then
167
147
exit 1
168
148
fi
0 commit comments