Merge "Configure Jenkins clouds and templates"

diff --git a/jjb/vpp/include-raw-vpp-checkstyle.sh b/jjb/vpp/include-raw-vpp-checkstyle.sh
index bc1e408..7c520dd 100644 (file)
--- a/jjb/vpp/include-raw-vpp-checkstyle.sh
+++ b/jjb/vpp/include-raw-vpp-checkstyle.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # jjb/vpp/include-raw-vpp-checkstyle.sh
 
-if [ "$(grep -E '^checkstyle:' Makefile)" = "checkstyle:" ]
+if [ -n "$(grep -E '^checkstyle:' Makefile)" ]
 then
        make checkstyle
 else

diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
index 6cb6fac..bdc8431 100644 (file)
--- a/jjb/vpp/include-raw-vpp-test-checkstyle.sh
+++ b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # jjb/vpp/include-raw-vpp-test-checkstyle.sh
 
-if [ "$(grep -E '^test-checkstyle:' Makefile)" = "test-checkstyle:" ]
+if [ -n "$(grep -E '^test-checkstyle:' Makefile)" ]
 then
        make test-checkstyle
 else
-       echo "Can't find test-checkstyle target in Makefile - skipping test checkstyle"
+       echo "Can't find test-checkstyle target in Makefile - skipping test-checkstyle"
 fi