From d2eda1a8648b7e6053627e48bf500f9671f0a6c2 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Fri, 3 Nov 2017 14:37:22 -0500
Subject: Enhancements to papr tests

The PR contains several enhancements to our CI testing.

- enable lint testing on Fedora
- add Centos Atomic as test platform
- integration tests on run on the OS natively (uncontainerized)
- builds are done in containers
- inclusion of Vagrant file for local testing

Signed-off-by: baude <bbaude@redhat.com>

Closes: #18
Approved by: mheon
---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 06d558dfc..f5a464d40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= 2b74391
+EPOCH_TEST_COMMIT ?= 5cfd7a3
+HEAD ?= HEAD
 PROJECT := github.com/projectatomic/libpod
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
@@ -41,6 +42,8 @@ KPOD_LDFLAGS := -X main.kpodVersion=${KPOD_VERSION}
 LDFLAGS := -ldflags '${BASE_LDFLAGS}'
 LDFLAGS_KPOD := -ldflags '${BASE_LDFLAGS} ${KPOD_LDFLAGS}'
 
+BOX="fedora_atomic"
+
 all: binaries docs
 
 default: help
@@ -114,6 +117,9 @@ testunit:
 localintegration: test-binaries
 	bash -i ./test/test_runner.sh ${TESTFLAGS}
 
+vagrant-check:
+	BOX=$(BOX) sh ./vagrant.sh
+
 binaries: conmon kpod
 
 test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp
@@ -151,13 +157,8 @@ uninstall:
 	done
 
 .PHONY: .gitvalidation
-# When this is running in travis, it will only check the travis commit range
 .gitvalidation: .gopathok
-ifeq ($(TRAVIS),true)
-	GIT_CHECK_EXCLUDE="./vendor" $(GOPATH)/bin/git-validation -q -run DCO,short-subject,dangling-whitespace
-else
-	GIT_CHECK_EXCLUDE="./vendor" $(GOPATH)/bin/git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD
-endif
+	GIT_CHECK_EXCLUDE="./vendor" $(GOPATH)/bin/git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD)
 
 .PHONY: install.tools
 
-- 
cgit v1.2.3-54-g00ecf