checkpoint

Makefile

@@ -1,5 +1,5 @@
 VERSION := $(shell echo $(shell git describe --tags 2>/dev/null || git log -1 --format='%h') | sed 's/^v//')
-COMMIT := $(shell git log -1 --format='%H')
+COMMIT := $(shell git rev-parse --short HEAD)
 DOCKER := $(shell which docker)
 ALL_VERSIONS := $(shell git tag -l)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
@@ -119,7 +119,7 @@ test-short:
 ## test-e2e: Run end to end tests via knuu. This command requires a kube/config file to configure kubernetes.
 test-e2e:
 	@echo "--> Running end to end tests"
-	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
+	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_LATEST_VERSION=$(COMMIT) E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
 .PHONY: test-e2e
 
 ## test-race: Run tests in race mode.

test/e2e/node.go

@@ -76,12 +76,12 @@ func NewNode(
 	if err != nil {
 		return nil, err
 	}
-	err = instance.SetArgs(
-		"start",
-		fmt.Sprintf("--home=%s", remoteRootDir),
-		"--rpc.laddr=tcp://0.0.0.0:26657",
-		fmt.Sprintf("--upgrade-height=%d", upgradeHeight),
-	)
+	args := []string{"start",fmt.Sprintf("--home=%s", remoteRootDir),"--rpc.laddr=tcp://0.0.0.0:26657"}
+	if upgradeHeight != 0 {
+		args = append(args, fmt.Sprintf("--upgrade-height=%d", upgradeHeight))
+	}
+
+	err = instance.SetArgs(args...)
 	if err != nil {
 		return nil, err
 	}

test/e2e/simple_test.go

@@ -26,12 +26,8 @@ func TestE2ESimple(t *testing.T) {
 		t.Skip("skipping e2e test")
 	}
 
-	if os.Getenv("E2E_VERSIONS") != "" {
-		versionsStr := os.Getenv("E2E_VERSIONS")
-		versions := ParseVersions(versionsStr)
-		if len(versions) > 0 {
-			latestVersion = versions.GetLatest().String()
-		}
+	if os.Getenv("E2E_LATEST_VERSION") != "" {
+		latestVersion = os.Getenv("E2E_LATEST_VERSION")		
 	}
 	t.Log("Running simple e2e test", "version", latestVersion)