Skip to content

Adds WS check, and some cleanup #6213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Nov 20, 2019
Merged

Adds WS check, and some cleanup #6213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/jenkins/bin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ set -x
${WERROR} \
${DEBUG}

echo
echo -n "Main build started at " && date
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
echo -n "Main build finished at " && date
17 changes: 13 additions & 4 deletions ci/jenkins/bin/clang-format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,23 @@
# limitations under the License.

cd "${WORKSPACE}/src"

# First, make sure there are no trailing WS!!!
git grep -IE ' +$' | fgrep -v '.gold:'
if [ "1" != "$?" ]; then
echo "Error: Trailing whitespaces are not allowed!"
echo "Error: Please run: git grep -IE ' +$'"
exit 1
fi

autoreconf -if && ./configure
[ "0" != "$?" ] && exit -1
[ "0" != "$?" ] && exit 1

${ATS_MAKE} -j clang-format
[ "0" != "$?" ] && exit -1
${ATS_MAKE} clang-format
[ "0" != "$?" ] && exit 1

git diff --exit-code
[ "0" != "$?" ] && exit -1
[ "0" != "$?" ] && exit 1

# Normal exit
exit 0
6 changes: 5 additions & 1 deletion ci/jenkins/bin/github.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,21 @@ autoreconf -if
${DEBUG}

# Build and run regressions
echo
echo -n "Main build started at " && date
${ATS_MAKE} ${ATS_MAKE_FLAGS} V=1 Q= || exit 1
echo -n "Main build finished at " && date
echo
echo -n "Unit tests started at " && date
${ATS_MAKE} check VERBOSE=Y V=1 && ${ATS_MAKE} install
${ATS_MAKE} -j 2 check VERBOSE=Y V=1 && ${ATS_MAKE} install
echo -n "Unit tests finished at " && date

[ -x ${INSTALL}/bin/traffic_server ] || exit 1

echo
echo -n "Regression tests started at " && date
${INSTALL}/bin/traffic_server -K -k -R 1
echo -n "Regression tests finished at " && date
[ "0" != "$?" ] && exit 1

exit 0
9 changes: 6 additions & 3 deletions ci/jenkins/bin/regression.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@
cd "${WORKSPACE}/${BUILD_NUMBER}/build"
[ -d BUILDS ] && cd BUILDS

${ATS_MAKE} check VERBOSE=Y V=1 || exit 1
echo
echo -n "Unit tests started at " && date
${ATS_MAKE} -j 2 check VERBOSE=Y V=1 || exit 1
echo -n "Unit tests finished at " && date
${ATS_MAKE} install || exit 1

echo
echo -n "Unit tests started at " && date
echo -n "Regression tests started at " && date
"${WORKSPACE}/${BUILD_NUMBER}/install/bin/traffic_server" -k -K -R 1
echo -n "Unit tests finished at " && date
echo -n "Regression tests finished at " && date