Modified Makefile and test in order to possibly test a different next version

Signed-off-by: Lou Marvin Caraig <[email protected]>

Author: se7entyse7en

Makefile

@@ -18,10 +18,16 @@ $(MAKEFILE):
 GOTEST_INTEGRATION = $(GOTEST) -parallel 1 -count 1 -tags=integration -ldflags "$(LD_FLAGS)"
 
 OS := $(shell uname)
+CURRENT_BUILD_PATH := $(BUILD_PATH)
 PREV_BUILD_PATH := build-prev
+NEXT_BUILD_PATH := build-next
 
-CURRENT_VERSION := $(shell git rev-parse --abbrev-ref HEAD)
+CURRENT_VERSION := $(shell git rev-parse HEAD)
+
+# Latest non release candidate version
 PREV_VERSION ?= $(shell git describe --abbrev=0 --tags --exclude "*-rc*")
+# Current commit
+NEXT_VERSION ?= $(CURRENT_VERSION)
 
 # Targets for integration testing
 integration-clean-previous:
@@ -34,12 +40,29 @@ integration-build-previous: integration-clean-previous integration-prepare-build
 	git checkout -q $(CURRENT_VERSION)
 	echo "Built version $(PREV_VERSION)"
 
-integration-clean-current: clean
-integration-build-current: integration-clean-current build docker-build
-	echo "Built current version"
+integration-clean-next:
+	rm -rf $(NEXT_BUILD_PATH)
+	$(GOCLEAN) .
+integration-prepare-build-next:
+	git checkout -q $(NEXT_VERSION)
+	$(eval BUILD_PATH = $(NEXT_BUILD_PATH))
+integration-build-next: integration-clean-next integration-prepare-build-next build docker-build
+	git checkout -q $(CURRENT_VERSION)
+	echo "Built version $(NEXT_VERSION)"
+
+integration-clean-current:
+	rm -rf $(CURRENT_BUILD_PATH)
+	$(GOCLEAN) .
+integration-prepare-build-current:
+	git checkout -q $(CURRENT_VERSION)
+	$(eval BUILD_PATH = $(CURRENT_BUILD_PATH))
+integration-build-current: integration-clean-current integration-prepare-build-current build docker-build
+	git checkout -q $(CURRENT_VERSION)
+	echo "Built version $(CURRENT_VERSION)"
 
 integration-build-all:
 	$(MAKE) integration-build-current
+	$(MAKE) integration-build-next
 	$(MAKE) integration-build-previous
 
 ifeq ($(OS),Darwin)

cmd/test-utils/common.go

@@ -19,6 +19,7 @@ import (
 // TODO (carlosms) this could be build/bin, workaround for https://github.com/src-d/ci/issues/97
 var srcdBin = fmt.Sprintf("../../../build/engine_%s_%s/srcd", runtime.GOOS, runtime.GOARCH)
 var srcdPrevBin = fmt.Sprintf("../../../build-prev/engine_%s_%s/srcd", runtime.GOOS, runtime.GOARCH)
+var srcdNextBin = fmt.Sprintf("../../../build-next/engine_%s_%s/srcd", runtime.GOOS, runtime.GOARCH)
 var configFile = "../../../integration-testing-config.yaml"
 
 func init() {
@@ -66,7 +67,7 @@ type IntegrationBackCompSuite struct {
 
 func NewIntegrationBackCompSuite() IntegrationBackCompSuite {
 	return IntegrationBackCompSuite{
-		IntegrationSuite: NewIntegrationSuite(),
+		IntegrationSuite: IntegrationSuite{Cmd: &Commander{bin: srcdNextBin}},
 		PrevCmd:          &Commander{bin: srcdPrevBin},
 	}
 }