From 9ba1287334a57076a5370685f193bfbef15e3a61 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Sun, 7 Mar 2021 11:59:46 +0100 Subject: [PATCH] travis script. Turning off verbose for grpcproxy. + Upgrade to '*.sh' variant of the scripts. --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 691422d2b..58508a956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,25 +72,25 @@ script: linux-amd64-fmt) docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test" + /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test.sh" ;; linux-amd64-integration-1-cpu) # TODO: Reenable 'race' when https://github.com/etcd-io/etcd/issues/12336 fixed. docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./test" + /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./test.sh" ;; linux-amd64-integration-2-cpu) # TODO: Reenable 'race' when https://github.com/etcd-io/etcd/issues/12336 fixed. docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./test" + /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./test.sh" ;; linux-amd64-integration-4-cpu) # TODO: Reenable 'race' when https://github.com/etcd-io/etcd/issues/12336 fixed. docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./test" + /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./test.sh" ;; linux-amd64-functional) docker run --rm \ @@ -100,29 +100,29 @@ script: linux-amd64-unit-4-cpu-race) docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./test -p=2" + /bin/bash -c "GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./test.sh -p=2" ;; all-build) docker run --rm \ --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \ - /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \ - && GOARCH=386 PASSES='build' ./test \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOOS=darwin GOARCH=amd64 ./build \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOOS=windows GOARCH=amd64 ./build \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm ./build \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm64 ./build \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=ppc64le ./build \ - && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=s390x ./build" + /bin/bash -c "GOARCH=amd64 PASSES='build' ./test.sh \ + && GOARCH=386 PASSES='build' ./test.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOOS=darwin GOARCH=amd64 ./build.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOOS=windows GOARCH=amd64 ./build.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm ./build.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=arm64 ./build.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=ppc64le ./build.sh \ + && GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=s390x ./build.sh" ;; linux-amd64-grpcproxy) # TODO: Reenable race when https://github.com/etcd-io/etcd/issues/12336 fixed. - sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy' VERBOSE='1' CPU='4' COVER='false' RACE='false'" make docker-test + sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy' CPU='4' COVER='false' RACE='false'" make docker-test ;; linux-amd64-coverage) sudo HOST_TMP_DIR=/tmp TEST_OPTS="VERBOSE='1'" make docker-test-coverage ;; linux-amd64-fmt-unit-go-tip-2-cpu) - GOARCH=amd64 PASSES='fmt unit' CPU='2' RACE='false' ./test -p=2 + GOARCH=amd64 PASSES='fmt unit' CPU='2' RACE='false' ./test.sh -p=2 ;; linux-386-unit-1-cpu) docker run --rm \