e2e: add flag to pass specific binary path for last release.

Signed-off-by: Siyuan Zhang <[email protected]>
etcd-io · May 1, 2024 · 8e41a69 · 8e41a69
1 parent ce45881
commit 8e41a69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tests/framework/e2e/flags.go b/tests/framework/e2e/flags.go
@@ -69,6 +69,8 @@ func InitFlags() {
 	certDirDef := FixturesDir
 
 	binDir := flag.String("bin-dir", binDirDef, "The directory for store etcd and etcdctl binaries.")
+	binLastRelease := flag.String("bin-last-release", "", "The path for the last release etcd binary.")
+
 	flag.StringVar(&CertDir, "cert-dir", certDirDef, "The directory for store certificate files.")
 	flag.Parse()
 
@@ -79,6 +81,9 @@ func InitFlags() {
 		Etcdutl:         *binDir + "/etcdutl",
 		LazyFS:          *binDir + "/lazyfs",
 	}
+	if *binLastRelease != "" {
+		BinPath.EtcdLastRelease = *binLastRelease
+	}
 	CertPath = CertDir + "/server.crt"
 	PrivateKeyPath = CertDir + "/server.key.insecure"
 	CaPath = CertDir + "/ca.crt"

diff --git a/tests/robustness/makefile.mk b/tests/robustness/makefile.mk
@@ -3,11 +3,14 @@ test-robustness-reports: export GOTOOLCHAIN := go$(shell cat .go-version)
 test-robustness-reports:
 	cd ./tests && go test ./robustness/validate -v --count 1 --run TestDataReports
 
+test-robustness-release-3.6: /tmp/etcd-release-3.5-failpoints/bin
+	GO_TEST_FLAGS="$${GO_TEST_FLAGS} --bin-last-release=/tmp/etcd-release-3.5-failpoints/bin/etcd" make test-robustness
+
 # Test previous release branches
 
 .PHONY: test-robustness-release-3.5
-test-robustness-release-3.5: /tmp/etcd-release-3.5-failpoints/bin
-	GO_TEST_FLAGS="$${GO_TEST_FLAGS} --bin-dir=/tmp/etcd-release-3.5-failpoints/bin" make test-robustness
+test-robustness-release-3.5: /tmp/etcd-release-3.5-failpoints/bin /tmp/etcd-release-3.4-failpoints/bin
+	GO_TEST_FLAGS="$${GO_TEST_FLAGS} --bin-dir=/tmp/etcd-release-3.5-failpoints/bin --bin-last-release=/tmp/etcd-release-3.4-failpoints/bin/etcd" make test-robustness
 
 .PHONY: test-robustness-release-3.4
 test-robustness-release-3.4: /tmp/etcd-release-3.4-failpoints/bin