From 576f8176df4ea9db7e34f6de4e87dcc5c43f657c Mon Sep 17 00:00:00 2001 From: Michele Carignani Date: Tue, 14 May 2019 10:54:02 +0200 Subject: [PATCH 1/2] validation scripts uses swagger-cli and speccy --- .jenkins.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 417488f..23e74f2 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -4,13 +4,15 @@ specfiles=$(ls | egrep "^[^.]*Api.(json|yaml)") fres=0 for i in $specfiles ; do - echo "-- Validating OpenAPI file $i..." - swagger-tools validate $i + echo "-- Validatingand linting OpenAPI file $i..." + swagger-cli validate $i res=$? - fres=$(($fres||$res)) - echo -e "-- Validator returned $res.\n" + speccy lint $i + res2=$? + fres=$(($fres||$res||$res2)) + echo "--- Validator returned $res, linter returned $res2." done -echo "-- Final validator returns $fres." +echo "-- Final validation returns $fres." -exit $fres \ No newline at end of file +exit $fres -- GitLab From 369cf0037a29756e8de7ddb65a9fcd379b7aeb48 Mon Sep 17 00:00:00 2001 From: Michele Carignani Date: Tue, 14 May 2019 10:57:09 +0200 Subject: [PATCH 2/2] fixed typo --- .jenkins.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 23e74f2..425806a 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -4,10 +4,10 @@ specfiles=$(ls | egrep "^[^.]*Api.(json|yaml)") fres=0 for i in $specfiles ; do - echo "-- Validatingand linting OpenAPI file $i..." - swagger-cli validate $i + echo "-- Validating and linting OpenAPI file $i..." + swagger-cli validate "$i" res=$? - speccy lint $i + speccy lint "$i" res2=$? fres=$(($fres||$res||$res2)) echo "--- Validator returned $res, linter returned $res2." -- GitLab