From 4a5f5f99a9c138f5ff37596befe676a83c70efc9 Mon Sep 17 00:00:00 2001
From: Tomas Nozicka <tnozicka@redhat.com>
Date: Wed, 25 Sep 2019 10:18:00 +0200
Subject: [PATCH] Drop Travis and hook the verify-commits into verify

---
 .travis.yml | 16 ----------------
 Makefile    |  9 +--------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 977712f351e3..000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: go
-
-go:
-  - 1.11
-
-install:
-  - export PATH=$GOPATH/bin:./_output/tools/etcd/bin:$PATH
-  - make install-travis
-
-script:
-  - make verify-commits
-
-notifications:
-  irc: "chat.freenode.net#openshift-dev"
-
-sudo: false
diff --git a/Makefile b/Makefile
index cf15c5021472..6a73f725979b 100644
--- a/Makefile
+++ b/Makefile
@@ -90,19 +90,12 @@ verify: build
 	hack/verify-generated-openapi.sh ||r=1;\
 	hack/verify-generated-json-codecs.sh ||r=1; \
 	hack/verify-generated-swagger-spec.sh ||r=1;\
+	hack/verify-upstream-commits.sh ||r=1;\
 	exit $$r ;\
 	}
 .PHONY: verify
 
 
-# Verify commit comments.
-#
-# Example:
-#   make verify-commits
-verify-commits:
-	hack/verify-upstream-commits.sh
-.PHONY: verify-commits
-
 # Update all generated artifacts.
 #
 # Example: