Skip to content

Commit 936221e

Browse files
e2e: Add multi-version support to generator (backport of tendermint#9933 to v0.34) (tendermint#9935)
* e2e: Improve help for multi-version CLI param Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Rename multiversion to multiVersion Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Extract generator params into struct Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Add support for more than 2 versions in multi-version tests Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Add generator logic to extract latest release tag from Git repo Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Cater for "dev-" prefixes in tags Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Add sophisticated weighted version parsing to generator Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Add note to E2E readme about multi-version testing Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Expand on Docker image comment in readme Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Replace "HEAD" keyword with "local" Also add the version weighting printout when generating a testnet for informational purposes. Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Update readme to reflect "HEAD" -> "local" keyword change and expand on examples Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Clarify comment relating to Docker image versions Signed-off-by: Thane Thomson <connect@thanethomson.com> * Apply suggestions from code review Co-authored-by: Sergio Mena <sergio@informal.systems> * e2e: Skip invalid tags instead of erroring in generator Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Add comment in version selection code Signed-off-by: Thane Thomson <connect@thanethomson.com> * e2e: Use error format specifier when returning wrapped error Signed-off-by: Thane Thomson <connect@thanethomson.com> Signed-off-by: Thane Thomson <connect@thanethomson.com> Co-authored-by: Sergio Mena <sergio@informal.systems>
1 parent 7056368 commit 936221e

6 files changed

Lines changed: 324 additions & 36 deletions

File tree

go.mod

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ require (
3535
require (
3636
github.com/google/uuid v1.3.0
3737
github.com/tendermint/tm-db v0.6.6
38-
golang.org/x/crypto v0.1.0
39-
golang.org/x/net v0.1.0
38+
golang.org/x/crypto v0.4.0
39+
golang.org/x/net v0.4.0
4040
google.golang.org/grpc v1.50.1
4141
)
4242

@@ -52,8 +52,10 @@ require (
5252
)
5353

5454
require (
55+
github.com/Masterminds/semver/v3 v3.2.0
5556
github.com/btcsuite/btcd/btcec/v2 v2.2.1
5657
github.com/btcsuite/btcd/btcutil v1.1.2
58+
github.com/go-git/go-git/v5 v5.5.1
5759
github.com/vektra/mockery/v2 v2.14.0
5860
gonum.org/v1/gonum v0.8.2
5961
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8
@@ -72,6 +74,8 @@ require (
7274
github.com/Microsoft/go-winio v0.6.0 // indirect
7375
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
7476
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
77+
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
78+
github.com/acomagu/bufpipe v1.0.3 // indirect
7579
github.com/alexkohler/prealloc v1.0.0 // indirect
7680
github.com/alingse/asasalint v0.0.11 // indirect
7781
github.com/ashanbrown/forbidigo v1.3.0 // indirect
@@ -90,6 +94,7 @@ require (
9094
github.com/cespare/xxhash/v2 v2.1.2 // indirect
9195
github.com/charithe/durationcheck v0.0.9 // indirect
9296
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
97+
github.com/cloudflare/circl v1.3.1 // indirect
9398
github.com/containerd/containerd v1.6.8 // indirect
9499
github.com/containerd/continuity v0.3.0 // indirect
95100
github.com/containerd/typeurl v1.0.2 // indirect
@@ -108,6 +113,7 @@ require (
108113
github.com/docker/go-connections v0.4.0 // indirect
109114
github.com/docker/go-units v0.5.0 // indirect
110115
github.com/dustin/go-humanize v1.0.0 // indirect
116+
github.com/emirpasic/gods v1.18.1 // indirect
111117
github.com/esimonov/ifshort v1.0.4 // indirect
112118
github.com/ettle/strcase v0.1.1 // indirect
113119
github.com/fatih/color v1.13.0 // indirect
@@ -117,6 +123,8 @@ require (
117123
github.com/fzipp/gocyclo v0.6.0 // indirect
118124
github.com/go-chi/chi/v5 v5.0.7 // indirect
119125
github.com/go-critic/go-critic v0.6.5 // indirect
126+
github.com/go-git/gcfg v1.5.0 // indirect
127+
github.com/go-git/go-billy/v5 v5.3.1 // indirect
120128
github.com/go-logr/logr v1.2.3 // indirect
121129
github.com/go-logr/stdr v1.2.2 // indirect
122130
github.com/go-toolsmith/astcast v1.0.0 // indirect
@@ -154,13 +162,16 @@ require (
154162
github.com/hashicorp/go-version v1.6.0 // indirect
155163
github.com/hashicorp/hcl v1.0.0 // indirect
156164
github.com/hexops/gotextdiff v1.0.3 // indirect
165+
github.com/imdario/mergo v0.3.13 // indirect
157166
github.com/inconshreveable/mousetrap v1.0.1 // indirect
167+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
158168
github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect
159169
github.com/jgautheron/goconst v1.5.1 // indirect
160170
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
161171
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
162172
github.com/jmhodges/levigo v1.0.0 // indirect
163173
github.com/julz/importas v0.1.0 // indirect
174+
github.com/kevinburke/ssh_config v1.2.0 // indirect
164175
github.com/kisielk/errcheck v1.6.2 // indirect
165176
github.com/kisielk/gotool v1.0.0 // indirect
166177
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
@@ -202,6 +213,7 @@ require (
202213
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
203214
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
204215
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
216+
github.com/pjbgf/sha1cd v0.2.3 // indirect
205217
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
206218
github.com/pkg/profile v1.6.0 // indirect
207219
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -222,11 +234,13 @@ require (
222234
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
223235
github.com/satori/go.uuid v1.2.0 // indirect
224236
github.com/securego/gosec/v2 v2.13.1 // indirect
237+
github.com/sergi/go-diff v1.2.0 // indirect
225238
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
226239
github.com/sirupsen/logrus v1.9.0 // indirect
227240
github.com/sivchari/containedctx v1.0.2 // indirect
228241
github.com/sivchari/nosnakecase v1.7.0 // indirect
229242
github.com/sivchari/tenv v1.7.0 // indirect
243+
github.com/skeema/knownhosts v1.1.0 // indirect
230244
github.com/sonatard/noctx v0.0.1 // indirect
231245
github.com/sourcegraph/go-diff v0.6.1 // indirect
232246
github.com/spf13/afero v1.8.2 // indirect
@@ -247,6 +261,7 @@ require (
247261
github.com/ultraware/funlen v0.0.3 // indirect
248262
github.com/ultraware/whitespace v0.0.5 // indirect
249263
github.com/uudashr/gocognit v1.0.6 // indirect
264+
github.com/xanzy/ssh-agent v0.3.3 // indirect
250265
github.com/yagipy/maintidx v1.0.0 // indirect
251266
github.com/yeya24/promlinter v0.2.0 // indirect
252267
gitlab.com/bosi/decorder v0.2.3 // indirect
@@ -261,14 +276,15 @@ require (
261276
go.uber.org/zap v1.23.0 // indirect
262277
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
263278
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
264-
golang.org/x/mod v0.6.0 // indirect
265-
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
266-
golang.org/x/sys v0.1.0 // indirect
267-
golang.org/x/term v0.1.0 // indirect
268-
golang.org/x/text v0.4.0 // indirect
269-
golang.org/x/tools v0.2.0 // indirect
279+
golang.org/x/mod v0.7.0 // indirect
280+
golang.org/x/sync v0.1.0 // indirect
281+
golang.org/x/sys v0.3.0 // indirect
282+
golang.org/x/term v0.3.0 // indirect
283+
golang.org/x/text v0.5.0 // indirect
284+
golang.org/x/tools v0.4.0 // indirect
270285
google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a // indirect
271286
gopkg.in/ini.v1 v1.67.0 // indirect
287+
gopkg.in/warnings.v0 v0.1.2 // indirect
272288
gopkg.in/yaml.v2 v2.4.0 // indirect
273289
gopkg.in/yaml.v3 v3.0.1 // indirect
274290
honnef.co/go/tools v0.3.3 // indirect

0 commit comments

Comments
 (0)