vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch release-test (upgrade test) to use etcd 3.4 (instead of 3.3) as upgrade-base.

release-3.5
Piotr Tabor 2021-03-28 12:58:30 +02:00
parent 931af493cf
commit d4a8093ea5
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -157,7 +157,7 @@ test-smoke:
test-full:
$(info log-file: test-$(TEST_SUFFIX).log)
PASSES="fmt build unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log
PASSES="fmt build release unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log
docker-test:
$(info GO_VERSION: $(GO_VERSION))

2
test.sh
View File

@ -613,7 +613,7 @@ function dep_pass {
function release_pass {
rm -f ./bin/etcd-last-release
# to grab latest patch release; bump this up for every minor release
UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.3.*" | head -1)
UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.4.*" | head -1)
if [ -n "$MANUAL_VER" ]; then
# in case, we need to test against different version
UPGRADE_VER=$MANUAL_VER

16
tests/e2e/main_test.go
View File

@ -6,7 +6,9 @@ package e2e
import (
"flag"
"log"
"os"
"path/filepath"
"runtime"
"testing"
@ -36,8 +38,18 @@ func TestMain(m *testing.M) {
os.Setenv("ETCD_UNSUPPORTED_ARCH", runtime.GOARCH)
os.Unsetenv("ETCDCTL_API")
flag.StringVar(&binDir, "bin-dir", "../../bin", "The directory for store etcd and etcdctl binaries.")
flag.StringVar(&certDir, "cert-dir", "../fixtures", "The directory for store certificate files.")
binDirDef, err := filepath.Abs("../../bin")
if err != nil {
log.Fatal(err)
}
certDirDef, err := filepath.Abs("../fixtures")
if err != nil {
log.Fatal(err)
}
flag.StringVar(&binDir, "bin-dir", binDirDef, "The directory for store etcd and etcdctl binaries.")
flag.StringVar(&certDir, "cert-dir", certDirDef, "The directory for store certificate files.")
flag.Parse()
binPath = binDir + "/etcd"