@@ -59,15 +59,13 @@ if [ "${1:-}" = '--only-integration-tests' ]; then
59
59
fi
60
60
61
61
VERIFY_STATUS=
62
- ANSIBLE_LINT_STATUS=
63
62
64
63
DANGER_STATUS=skip
65
64
if [ " ${SPRING_PROFILES_ACTIVE:- } " = ' travis' ] && [ " ${TRAVIS_PULL_REQUEST:- false} " != ' false' ]; then
66
65
DANGER_STATUS=
67
66
fi
68
67
69
68
VERIFY_TIME=0
70
- ANSIBLE_LINT_TIME=0
71
69
DANGER_TIME=0
72
70
73
71
CURDIR=" $( dirname " $0 " ) "
@@ -88,15 +86,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
88
86
MODIFIED_FILES=" $( git --no-pager diff --name-only " $TRAVIS_COMMIT_RANGE " -- 2> /dev/null || :) "
89
87
90
88
if [ -n " $MODIFIED_FILES " ]; then
91
- AFFECTS_TRAVIS_CFG=" $( echo " $MODIFIED_FILES " | grep -Fxq ' .travis.yml' || echo ' no' ) "
92
- AFFECTS_PLAYBOOKS=" $( echo " $MODIFIED_FILES " | grep -Eq ' (vagrant|prod|deploy|bootstrap|/roles/.+)\.yml$' || echo ' no' ) "
93
-
94
- if [ " $AFFECTS_TRAVIS_CFG " = ' no' ]; then
95
- if [ " $AFFECTS_PLAYBOOKS " = ' no' ]; then
96
- ANSIBLE_LINT_STATUS=skip
97
- fi
98
- fi
99
-
100
89
echo ' INFO: Some checks could be skipped'
101
90
else
102
91
echo " INFO: Couldn't determine list of modified files."
@@ -108,13 +97,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
108
97
fi
109
98
110
99
echo
111
-
112
- if [ " $ANSIBLE_LINT_STATUS " != ' skip' ]; then
113
- START_TIME=$SECONDS
114
- " $EXEC_CMD " ansible-lint > ansible_lint.log 2>&1 || ANSIBLE_LINT_STATUS=fail
115
- ANSIBLE_LINT_TIME=$(( SECONDS - START_TIME))
116
- fi
117
- print_status " $ANSIBLE_LINT_STATUS " $ANSIBLE_LINT_TIME ' Run Ansible Lint'
118
100
fi
119
101
120
102
START_TIME=$SECONDS
@@ -131,18 +113,14 @@ if [ "$DANGER_STATUS" != 'skip' ]; then
131
113
fi
132
114
print_status " $DANGER_STATUS " " $DANGER_TIME " ' Run danger'
133
115
134
- if [ " $RUN_ONLY_INTEGRATION_TESTS " = ' no' ]; then
135
- [ " $ANSIBLE_LINT_STATUS " = ' skip' ] || print_log ansible_lint.log ' Run Ansible Lint'
136
- fi
137
-
138
116
print_log verify.log ' Run integration tests'
139
117
140
118
if [ " $DANGER_STATUS " != ' skip' ]; then
141
119
print_log danger.log ' Run danger'
142
120
fi
143
121
144
- rm -f verify.log danger.log ansible_lint.log
122
+ rm -f verify.log danger.log
145
123
146
- if echo " $VERIFY_STATUS$DANGER_STATUS$ANSIBLE_LINT_STATUS " | grep -Fqs ' fail' ; then
124
+ if echo " $VERIFY_STATUS$DANGER_STATUS " | grep -Fqs ' fail' ; then
147
125
exit 1
148
126
fi
0 commit comments