From c42d3aa3ccd00fb4af3f14bd376af40b14431a5c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Fri, 25 Oct 2019 15:53:04 -0700
Subject: [PATCH] combine lint and boilerplate

---
 .travis.yml | 2 ++
 test.sh     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76fb457493..7f58006201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ matrix:
     - language: go
       name: Code Lint
       go: 1.12.12
+      env:
+        - TESTSUITE=lintall
       before_install:
         - sudo apt-get install -y libvirt-dev
       script: make test
diff --git a/test.sh b/test.sh
index 846ed3e575..463cca159f 100755
--- a/test.sh
+++ b/test.sh
@@ -19,7 +19,7 @@ set -eu -o pipefail
 TESTSUITE="${TESTSUITE:-all}" # if env variable not set run all the tests
 exitcode=0
 
-if [[ "$TESTSUITE" = "lint" ]] || [[ "$TESTSUITE" = "all" ]]
+if [[ "$TESTSUITE" = "lint" ]] || [[ "$TESTSUITE" = "all" ]] || [[ "$TESTSUITE" = "lintall" ]]
 then
     echo "= make lint ============================================================="
     make -s lint-ci && echo ok || ((exitcode += 4))
@@ -30,7 +30,7 @@ fi
 
 
 
-if [[ "$TESTSUITE" = "boilerplate" ]] || [[ "$TESTSUITE" = "all" ]]
+if [[ "$TESTSUITE" = "boilerplate" ]] || [[ "$TESTSUITE" = "all" ]] || [[ "$TESTSUITE" = "lintall" ]]
 then
     echo "= boilerplate ==========================================================="
     readonly ROOT_DIR=$(pwd)
@@ -50,7 +50,7 @@ fi
 
 
 if [[ "$TESTSUITE" = "unittest" ]] || [[ "$TESTSUITE" = "all" ]]
-then 
+then
     echo "= schema_check =========================================================="
     go run deploy/minikube/schema_check.go >/dev/null && echo ok || ((exitcode += 16))