Merge pull request #6846 from mikesplain/automated-cherry-pick-of-#68…

…41-origin-release-1.14 Automated cherry pick of #6841: Remove verify bazel from travis its run in prow
kubernetes · Apr 27, 2019 · 3c2c4c8 · 3c2c4c8
2 parents 6ab37b8 + 7e19a79
commit 3c2c4c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -565,8 +565,9 @@ ci: govet verify-gofmt verify-boilerplate verify-bazel verify-misspelling nodeup
 # travis-ci is the target that travis-ci calls
 # we skip tasks that rely on bazel and are covered by other jobs
 #  verify-gofmt: uses bazel, covered by pull-kops-verify-gofmt
+#  verify-bazel: uses bazel, covered by pull-kops-verify-bazel
 .PHONY: travis-ci
-travis-ci: govet verify-boilerplate verify-bazel verify-misspelling nodeup examples test | verify-gendocs verify-packages verify-apimachinery
+travis-ci: govet verify-boilerplate verify-misspelling nodeup examples test | verify-gendocs verify-packages verify-apimachinery
 	echo "Done!"
 
 .PHONY: pr

diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh
@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
-set -o nounset
-set -o pipefail
-
 KOPS_ROOT=$(git rev-parse --show-toplevel)
 cd ${KOPS_ROOT}