Skip to content

Commit

Permalink
setting bootstrap version to 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
maksimov committed Oct 24, 2023
1 parent 8463dcb commit 7497bde
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
# This rule builds the bootstrap images for all flavors.
DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql56 mysql57 mysql80 percona percona57 percona80
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
BOOTSTRAP_VERSION=3.2
BOOTSTRAP_VERSION=3.3
ensure_bootstrap_version:
find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
Expand Down
8 changes: 5 additions & 3 deletions test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ run against a given flavor, it may take some time for the corresponding
bootstrap image (vitess/bootstrap:<flavor>) to be downloaded.
It is meant to be run from the Vitess root, like so:
$ go run test.go [args]
$ go run test.go [args]
For a list of options, run:
$ go run test.go --help
$ go run test.go --help
*/
package main

Expand Down Expand Up @@ -74,7 +76,7 @@ For example:
// Flags
var (
flavor = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
bootstrapVersion = flag.String("bootstrap-version", "3.1", "the version identifier to use for the docker images")
bootstrapVersion = flag.String("bootstrap-version", "3.3", "the version identifier to use for the docker images")
runCount = flag.Int("runs", 1, "run each test this many times")
retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
logPass = flag.Bool("log-pass", false, "log test output even if it passes")
Expand Down

0 comments on commit 7497bde

Please sign in to comment.